Merge branch 'dev'

src/views/ecw/box/batchMarkup.vue

@@ -6,8 +6,8 @@
         {{$t('运费或全包加价')}}
         <!--货币-->
         <selector :disabled="approval" v-model="form.freightCurrencyId" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable class="w-100 ml-10" />
-        <!--金额-->
-        <el-input :disabled="approval" type="number" v-model="form.freightFee" :min="1"  @keyup.native="checkPositive(form, 'freightFee')"  class="w-100 ml-10" />
+        <!--金额 :min="1"-->
+        <el-input :disabled="approval" type="number" v-model="form.freightFee"   @keyup.native="checkPositive(form, 'freightFee')"  class="w-100 ml-10" />
         <!--单位-->
         <selector :disabled="approval" v-model="form.freightUnitId" :options="unitList" :label-field="$l('title')" value-field="id" defaultable  class="w-100 ml-10" />
     </div>
@@ -15,8 +15,8 @@
         {{$t('清关费加价')}}
         <!--货币-->
         <selector  :disabled="approval" v-model="form.clearanceCurrencyId" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable  class="w-100 ml-10" />
-        <!--金额-->
-        <el-input  :disabled="approval" type="number" v-model="form.clearanceFee" :min="1"  @keyup.native="checkPositive(form, 'clearanceFee')"  class="w-100 ml-10" />
+        <!--金额 :min="1"-->
+        <el-input  :disabled="approval" type="number" v-model="form.clearanceFee"   @keyup.native="checkPositive(form, 'clearanceFee')"  class="w-100 ml-10" />
         <!--单位-->
         <selector  :disabled="approval" v-model="form.clearanceUnitId" :options="unitList" :label-field="$l('title')" value-field="id" defaultable  class="w-100 ml-10" />
         <span>*{{$t('若线路价格为全包价，输入清关费不生效')}}</span>
@@ -276,8 +276,8 @@ export default {
   methods:{
     // 检查正数
     checkPositive(object, field){
-      object[field] = parseFloat(object[field])
-      object[field] = isNaN(object[field]) ? '' : object[field].toString()
+     // object[field] = parseFloat(object[field])
+     // object[field] = isNaN(object[field]) ? '' : object[field].toString()
     },
     // 表格多选
     handleSelectionChange(selection) {

src/views/ecw/order/edit.vue

@@ -442,10 +442,23 @@
             </div>
             <div>
                 <el-form-item :label="$t('收货方式')" prop="harvestMethod" class="ml-20">
-                    <dict-selector :type="DICT_TYPE.ECW_HARVEST_METHOD" v-model="form.harvestMethod" :filter="item => item.value == 1 || homeDeliveryService" defaultable :disabled="false" />
+                    <!--
+                    <dict-selector :type="DICT_TYPE.ECW_HARVEST_METHOD"
+                     v-model="form.harvestMethod" :filter="item => item.value == 1 
+                     || homeDeliveryService" defaultable :disabled="false" />-->
+
+              <el-select v-model="harvestMethod2" @change="handleChange">
+               <el-option
+                v-for="dict in lunchList"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+              </el-select>
+
                 </el-form-item>
             </div>
-            <div v-if="homeDeliveryService && +form.harvestMethod === 2">
+            <div v-if="showAdress">
                 <el-form-item :label="$t('收货地区')" prop="country">
                     <area-selector
                     :country="form.consigneeVO ? form.consigneeVO.country : undefined"
@@ -727,7 +740,13 @@ export default {
       updateChannel: false, // 是否更新渠道
       offerData: [],// 关联报价单
       offerIdNochange:false,
-      offerNumber:null
+      offerNumber:null,
+      showAdress: false,
+      harvestMethod2: null,
+      lunchList: [
+        { label: "自提", value: 1 },
+        { label: "送货上门", value: 2 },
+      ],
     };
   },
   computed:{
@@ -1258,10 +1277,20 @@ export default {
                         this.initing = false
                       console.log("初始化完成 initing", this.initing)
                     })
+
                 }, 100)
 
             })
 
+             //alert(this.form.harvestMethod);
+             if (this.form.harvestMethod == 2) {
+                     this.showAdress = true;
+                      this.harvestMethod2 = this.form.harvestMethod;
+                    } else {
+                       this.showAdress = false;
+                       this.harvestMethod2 = this.form.harvestMethod;
+                     }
+
           console.log('order数据加载成功')
         }).catch(() => {
             this.initing = false
@@ -1412,9 +1441,35 @@ export default {
                 this.form.orderItemVOList.splice(index, 1)
             })
     },
+    handleChange(harvestMethod) {
+      if (harvestMethod == 1) {
+        this.showAdress = false;
+      } else {
+        if (this.homeDeliveryService == false) {
+          this.harvestMethod2 = 1;
+          this.$message.error("此路线未开通上门服务。");
+          return;
+        }
+        this.showAdress = true;
+      }
+      if (harvestMethod == 2 && !this.form.address && this.form.consigneeId) {
+        getCustomer(this.form.consigneeId).then((res) => {
+          if (res.data.address) {
+            this.$set(this.form, "consigneeAddress", res.data.address);
+          }
+        });
+      }
+    },
     /** 提交按钮 */
     // type 在新建的时候表示状态，0草稿，2带入仓
     submitForm(submitType) {
+      this.form.harvestMethod=this.harvestMethod2;
+      if (this.harvestMethod2 == 2&&
+      this.homeDeliveryService == false
+      ) {
+          this.$message.error("此路线未开通上门服务。");
+      }
+
       this.$refs["form"].validate(async (valid, errors) => {
         if (!valid) {
           return this.$showFormValidateErrors(errors)

src/views/ecw/order/prepayDeal.vue

@@ -1645,7 +1645,7 @@
                   :value="item.channelId"
                 />
               </el-select>
-              <!--                <selector
+              <!--<selector
                     v-model="handlerParams.channelId"
                     :options="channelList"
                     value-field="channelId"
@@ -2331,6 +2331,14 @@ export default {
           this.orderExceptionData.orderExceptionAmountCurrencyId
         );
       }
+      
+      if (
+        this.orderExceptionData.orderExceptionType ==
+        "not_shipping_channel_exception"
+      ) {
+        //初始话渠道数据
+        this.calculationPrice();
+      }
     },
     "orderData.consigneeVO"(val) {
       if (!val) return "-";
@@ -2439,7 +2447,7 @@ export default {
       );
       this.calculationPrice();
     },
-    getDictData,
+    //getDictData,
     onTableMounted(e) {
       // console.warn('onTableMounted', e)
     },
@@ -2903,7 +2911,7 @@ export default {
           };
           this.handlerParams.channelPriceList.push(listItem);
         });
-        
+
         if (priceUnit) {
           this.$modal.msgError(
             this.$t("请先去设置运费或清关费本身的货币单位、计价单位")
@@ -3124,8 +3132,8 @@ export default {
         if (!tmp.quantity) tmp.quantity = 1;
         if (!tmp.num) tmp.num = 1;
         tmp.orderType = item.orderItemType;
-        //lanbm 2024-06-22 包装类型
-        tmp.packaging=item.unit;
+        //包装类型
+        tmp.packaging = item.unit;
         arr.push(tmp);
       });
       return arr;

src/views/ecw/order/warehousing/components/Warehouse.vue

@@ -1043,10 +1043,10 @@ export default {
     },
     handleDeleteRow(index, val) {
       if (val === 1) {
-        this.form1.table.splice(index, 1)
+        this.form1.table.splice(index, 1);
       } else if (this.form.table.length > this.protectRowCount) {
-        this.form.table.splice(index, 1)
-      }
+        this.form.table.splice(index, 1);
+      }  
     },
     handleAdd(val = 0) {
       let cartonsNum = ''