2024-06-28-02提交

src/views/ecw/order/edit.vue

@@ -841,26 +841,27 @@
             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" />
             <!--
-            <el-select
+            <dict-selector
+              :type="DICT_TYPE.ECW_HARVEST_METHOD"
               v-model="form.harvestMethod"
-              ref="select"
-              @change="handleChange"
-            >
+              :filter="(item) => item.value == 1 || homeDeliveryService"
+              defaultable
+              :disabled="false"
+            />-->
+
+            <el-select v-model="harvestMethod2" @change="handleChange">
               <el-option
-                v-for="(t, i) of lunchList"
-                :key="i"
-                :label="t.label"
-                :value="t.value"
+                v-for="dict in lunchList"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
               ></el-option>
-            </el-select>-->
+            </el-select>
           </el-form-item>
         </div>
-        <div v-if="homeDeliveryService&&form.harvestMethod==2">
+        <!--<div v-if="homeDeliveryService&&form.harvestMethod==2">-->
+        <div v-show="showAdress">
           <el-form-item :label="$t('收货地区')" prop="country">
             <area-selector
               :country="form.consigneeVO ? form.consigneeVO.country : undefined"
@@ -1331,6 +1332,8 @@ export default {
       offerData: [], // 关联报价单
       offerIdNochange: false,
       offerNumber: null,
+      showAdress: false,
+      harvestMethod2: null,
       lunchList: [
         { label: "自提", value: 1 },
         { label: "送货上门", value: 2 },
@@ -1678,7 +1681,11 @@ export default {
       }
     },
     // 选择送货上门需要查询并填充默认地址
-    "form.harvestMethod"(harvestMethod) {
+    /*
+    "form.harvestMethod1"(harvestMethod) {
+      // if (harvestMethod == 2) this.showAdress = true;
+      //else this.showAdress = false;
+
       if (harvestMethod == 2 && !this.form.address && this.form.consigneeId) {
         getCustomer(this.form.consigneeId).then((res) => {
           if (res.data.address) {
@@ -1686,7 +1693,8 @@ export default {
           }
         });
       }
-    },
+    },*/
+
     "form.isCargoControl"(isCargoControl) {
       console.log(
         "form.isCargoControl",
@@ -1833,7 +1841,18 @@ export default {
       };
       this.channelList = (await getChannelList(query)).data;
     },
+
     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) {
@@ -2042,8 +2061,15 @@ export default {
               });
             }, 100);
           });
-          //alert(this.form.harvestMethod);
-          this.handleChange(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(() => {
@@ -2241,6 +2267,13 @@ export default {
     /** 提交按钮 */
     // type 在新建的时候表示状态，0草稿，2带入仓
     submitForm(submitType) {
+      this.form.harvestMethod = this.harvestMethod2;
+      if (this.harvestMethod2 == 2) {
+        if (this.homeDeliveryService == false) {
+          this.$message.error("此路线未开通上门服务。");
+        }
+      }
+
       this.$refs["form"].validate(async (valid, errors) => {
         if (!valid) {
           return this.$showFormValidateErrors(errors);