Merge remote-tracking branch 'origin/dev' into dev

src/utils/dict.js

@@ -239,7 +239,7 @@ export const DICT_TYPE = {
 
   APP_TYPE:"app_type",   //系统类型
   AIR_SHIPMENT_PROCESS:'air_shipment_process',
-  AIR_CUSTOM_CLEARANCE:'air_custom _clearance', //渠道清关费
+  CUSTOM_CLEARANCE:'custom _clearance', //全部列表空运订单重量上限
   AIR_COMMODITY_CUSTOM_CLEARANCE:'air_commodity_custom _clearance'//商品渠道清关费,
 
 }

src/views/ecw/channel/componrnts/packaging-type.vue

@@ -95,24 +95,17 @@ export default {
     }
   },
   computed:{
-    // screenCom(){
-    //   let num = undefined
-    //   if(this.keyArr === 'channelPriceStepClearanceList'){
-    //     num = this.getDictDatas(this.DICT_TYPE.AIR_CUSTOM_CLEARANCE)[0]?.value
-    //   }else {
-    //     num = this.getDictDatas(this.DICT_TYPE. AIR_COMMODITY_CUSTOM_CLEARANCE)[0]?.value
-    //   }
-    //
-    //   return num
-    // }
+    screenCom(){
+      return  this.getDictDatas(this.DICT_TYPE.CUSTOM_CLEARANCE)[0]?.value
+    }
   },
   mounted() {
     this.value1 = this.value
-    // this.$nextTick(()=>{
-    //   if(!this.value1.airWeightLimit){
-    //     this.value1.airWeightLimit = this.screenCom
-    //   }
-    // })
+    this.$nextTick(()=>{
+      if(!this.value1.airWeightLimit){
+        this.value1.airWeightLimit = this.screenCom
+      }
+    })
       this.$nextTick(()=>{
         if(this.value1[this.keyArr] && this.value1[this.keyArr].length === 0){
           this.addInterval()

src/views/ecw/channel/index.vue

@@ -124,7 +124,7 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('创建人')" prop="creatorName"></el-table-column>
-      <el-table-column :label="$t('创建人')" prop="">
+      <el-table-column :label="$t('更新时间')" prop="">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updateTime) }}</span>
         </template>