Merge branch 'feature/order_edit' into release

src/views/jiedao/profile/delivery.vue

@@ -813,7 +813,7 @@
           </el-descriptions-item>
 
           <!--付款人-->
-          <el-descriptions-item :label="$t('delivery.drawee')" :span="2">
+          <el-descriptions-item :label="$t('delivery.drawee')">
             <span
                 slot="label"
             ><span style="color: red">*</span>{{ $t("delivery.drawee") }}</span>
@@ -827,7 +827,6 @@
               <dict-selector
                   v-model="form.drawee"
                   :type="DICT_TYPE.DRAWEE"
-                  :filter="(e) => e.value == '1' || e.value == '2'"
                   defaultable
                   form-type="radio"
               />
@@ -847,6 +846,15 @@
               </template>
             </div>
           </el-descriptions-item>
+          <el-descriptions-item :label="$t('提单是否显示价格')" >
+            <el-form-item prop="displayBillLadingPrice">
+              <el-radio-group v-model="form.displayBillLadingPrice">
+                <el-radio :label="true">{{$t('显示')}}</el-radio>
+                <el-radio :label="false">{{$t('不显示')}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-descriptions-item>
+
           <!--入仓类型-->
           <el-descriptions-item :label="$t('delivery.warehouseType')">
             <span
@@ -1199,7 +1207,7 @@
           @click="submitForm(2, false)"
           :disabled="isOverSeaWareHouse"
         >{{ $t("提交") }}</el-button>
-        <el-button @click="$router.back()">{{ $t("common.cancel") }}</el-button>
+        <el-button @click="handleCancel">{{ $t("common.cancel") }}</el-button>
       </el-form-item>
       <div style="padding-bottom: 20px; font-size: 12px; color: red" v-if="isOverSeaWareHouse">
         {{$t('如需海外仓服务，请联系客服，服务热线：{tel}', {tel: '400-900-9962'})}}
@@ -1625,6 +1633,7 @@ export default {
         destCountryId: null,
         countryCode: '86',
         objectiveId: '',
+        departureId: '',
         status: 0,
         consigneeName: '',
         consigneePhone: '',
@@ -1640,7 +1649,8 @@ export default {
         drawee: 2,
         type: [],
         orderItemVOList: [],
-        externalWarehouseDtoList:[]
+        externalWarehouseDtoList:[],
+        displayBillLadingPrice: true
       },
       // 总条数
       total: 0,
@@ -1963,8 +1973,8 @@ export default {
       console.log(harvestMethod)
     },
     // 服务
-    'form.type'(type){
-      if(type.indexOf('2') > -1){
+    'form.type'(type, oldType){
+      if(type.indexOf('2') > -1 && oldType?.indexOf('2') == -1){
         this.$alert(this.$t('如需海外仓服务，请联系客服，服务热线：{tel}', {tel: '400-900-9962'}))
       }
     },
@@ -2568,8 +2578,7 @@ export default {
             item.channelIds = Array.from(item.channelIdSet).join(',')
           }
         })
-        this.form.type =
-          this.form.type.length > 0 ? this.form.type.toString : ''
+        this.form.type = this.form.type?.join(",")
         this.form.status = status
         // 修改的提交
         if (this.form.orderId) {
@@ -2620,6 +2629,10 @@ export default {
           this.$bus.$emit('reload')
         })
       })
+    },
+    async handleCancel(){
+      await this.$confirm(this.$t("是否需要返回?"))
+      this.$router.back()
     }
   }
 }