2.2的新建订单优化

src/views/ecw/order/edit.vue

@@ -301,7 +301,8 @@
                     {{sum.totalWorth.toFixed() || 0}}元
                 </el-descriptions-item>
                 <el-descriptions-item :label="$t('保价费')">
-                    {{fee.insuranceFee || 0}} {{$t('美元')}}
+                    {{fee.insuranceFee || 0}}
+                    {{ selectedRouter ? currentcyMap[selectedRouter.currencyUnit || 1] : '' }}
                 </el-descriptions-item>
             </el-descriptions>
         </el-card>
@@ -313,7 +314,14 @@
                     <el-input v-model="form.marks" ></el-input>
                 </el-form-item>
                 <el-form-item :label="$t('是否控货')" prop="isCargoControl" class="ml-20">
-                    <dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" v-model="form.isCargoControl" form-type="radio"/>
+                    <dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING"
+                         v-model="form.isCargoControl"
+                         formatter="bool"
+                         form-type="radio"
+                         :filter="(item) => {
+                            return selectedRouter && selectedRouter.controlStatus === 1 && item.value === 'true' ? false : true
+                         }"
+                    />
                 </el-form-item>
             </div>
             <div class="form-section" v-if="collectionProxy">
@@ -833,6 +841,17 @@ export default {
         this.$set(this.form, 'objectiveId', router.destCityId)
 
         this.calculationPrice()
+        this.$nextTick(() => {
+          // 如果开启了默认送货上门，则默认选择送货上门，2是送货上门，10是默认送货上门
+          this.$set(this.form, 'harvestMethod', this.routeOtherServices.indexOf('2') > -1 && this.routeOtherServices.indexOf('10') > -1 ? '2' : '1')
+
+          // controlStatus 0 支持控货，1不支持控货
+          // 如果不支持控货，则控货不能选择是
+          if (router.controlStatus === 1) {
+            this.$set(this.form, 'isCargoControl', false)
+          }
+        })
+
     },
     /* 'form.packageTypeArr'(val){
         console.log('packageType', val, val.length)
@@ -1129,7 +1148,7 @@ export default {
     /** 提交按钮 */
     // type 在新建的时候表示状态，0草稿，2带入仓
     submitForm(submitType) {
-      this.$refs["form"].validate((valid, errors) => {
+      this.$refs["form"].validate(async (valid, errors) => {
         if (!valid) {
           return this.$showFormValidateErrors(errors)
         }
@@ -1165,6 +1184,13 @@ export default {
             }
         })
         this.form.packageType = this.form.packageTypeArr.join(',')
+
+        // 付款人=发货人提示
+        if (+this.form.drawee === 1) {
+          await this.$confirm(this.$t('请再次确认运费由您支付还是收货人支付?'))
+        }
+
+
         // 修改的提交
         if (this.form.orderNo != null) {
             let data = Object.assign({}, this.form, {