Merge branch 'feature/order_edit' into pre-release

src/main.js

@@ -123,7 +123,7 @@ Vue.prototype.$showFormValidateErrors = (errors) => {
    let createElement = vm.$createElement
    let fieldList = Object.values(errors)
    Element.Notification({
-         title: this.$t('表单错误'),
+         title: i18n.$t('表单错误'),
          type: 'warning',
          duration: 3000,
          message: createElement('div', fieldList.map(function (errorList) {

src/views/ecw/order/edit.vue

@@ -485,7 +485,7 @@
             </div>
             <div class="form-section flex">
               <el-form-item :label="$t('收货方式')" prop="harvestMethod" class="ml-20">
-                <el-select v-model="harvestMethod2" @change="handleChange">
+                <el-select v-model="form.harvestMethod" @change="handleChange">
                   <el-option :label="$t('自提')" :value="1" ></el-option>
                   <el-option v-if="homeDeliveryService" :label="$t('送货上门')" :value="2" ></el-option>
                 </el-select>
@@ -701,7 +701,7 @@ let makeDefaultFormData = () => {
     externalWarehouseDtoList:[],
     orderItemVOList:[],
     drawee: 2,
-    harvestMethod: "1",
+    harvestMethod: 1,
     displayBillLadingPrice: true
   }
 }
@@ -762,7 +762,7 @@ export default {
       offerIdNochange:false,
       offerNumber:null,
       showAdress: false,
-      harvestMethod2: null,
+      // harvestMethod2: null,
       /* lunchList: [
         { label: "自提", value: 1 },
         { label: "送货上门", value: 2 },
@@ -1052,7 +1052,7 @@ export default {
         this.calculationPrice()
         this.$nextTick(() => {
           // 如果开启了默认送货上门，则默认选择送货上门，2是送货上门，10是默认送货上门
-          this.$set(this.form, 'harvestMethod', this.routeOtherServices.indexOf('2') > -1 && this.routeOtherServices.indexOf('10') > -1 ? '2' : '1')
+          this.$set(this.form, 'harvestMethod', this.routeOtherServices.indexOf('2') > -1 && this.routeOtherServices.indexOf('10') > -1 ? 2 : 1)
 
           // controlStatus 0 支持控货，1不支持控货
           // 如果不支持控货，则控货不能选择是
@@ -1555,7 +1555,7 @@ export default {
         this.showAdress = false;
       } else {
         if (this.homeDeliveryService == false) {
-          this.harvestMethod2 = 1;
+          this.form.harvestMethod = 1;
           this.$message.error("此路线未开通上门服务。");
           return;
         }
@@ -1572,11 +1572,8 @@ export default {
     /** 提交按钮 */
     // type 在新建的时候表示状态，0草稿，2带入仓
     submitForm(submitType) {
-      this.form.harvestMethod=this.harvestMethod2;
-      if (this.harvestMethod2 == 2&&
-      this.homeDeliveryService == false
-      ) {
-          this.$message.error("此路线未开通上门服务。");
+      if (this.form.harvestMethod == 2 && this.homeDeliveryService == false) {
+          return this.$message.error("此路线未开通上门服务。");
       }
 
       this.$refs["form"].validate(async (valid, errors) => {
@@ -1840,8 +1837,9 @@ export default {
         this.form.lineId = null
         this.selectedRouter = null
         this.form.destCountryId = this.destCityList.find(item => item.shi === val)?.guojia
-        await this.updateRoutes('handleChangeDestCity')
+
       }
+      await this.updateRoutes('handleChangeDestCity')
     },
     // 切换路线
     setLineId(lineId){