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

src/views/ecw/box/shippingAir/nodePage/unloading/startUnloading.vue

@@ -322,8 +322,8 @@ export default {
       
     },
     /** 取消 */
-    cancel() {
-      this.$emit("closeStart", "submit");
+    cancel(type) {
+      this.$emit('closeDialog', type)
     },
     /* 关闭弹窗 */
     closeDialog(type) {
@@ -361,7 +361,7 @@ export default {
         shipmentId: shipmentObj.id,
       }).then((res) => {
         serviceMsg(res, this).then(() => {
-          this.cancel();
+          this.cancel("submit");
         });
       });
     },

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

@@ -80,8 +80,6 @@ export default {
   name: "packaging-type",
   components: {Template, WeightSelect, CurrencySelect},
   created() {
-
-    console.log(this.getDictDatas(this.DICT_TYPE.AIR_CUSTOM_CLEARANCE),'123')
     getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
     getUnitList().then(res => this.unitList = res.data)
     },
@@ -105,11 +103,14 @@ export default {
         num = this.getDictDatas(this.DICT_TYPE. AIR_COMMODITY_CUSTOM_CLEARANCE)[0]?.value
       }
 
-      return +num
+      return num
     }
   },
   mounted() {
     this.value1 = this.value
+    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/order/components/PackHistoryDetail.vue

@@ -18,9 +18,9 @@
             <el-descriptions-item :label="$t('商品特性')">{{productAttr}}</el-descriptions-item>
             <el-descriptions-item :label="$t('用途')">
               <div v-if="orderItem.usageIds">
-                  <div v-for="(item,index) in row.usageIds.split(',')">
+                  <div v-for="(item,index) in orderItem.usageIds.split(',')">
                     <dict-tag :type="DICT_TYPE.OREER_ITEM_USAGE" :value="item" />
-                    <span v-if="(index+1)!=row.usageIds.split(',').length">,</span>
+                    <span v-if="(index+1)!=orderItem.usageIds.split(',').length">,</span>
                   </div>
                 </div>
               </el-descriptions-item>
@@ -163,12 +163,14 @@
       </div>
     </el-dialog>
     <el-dialog :title="$t('箱明细')" :visible.sync="boxShow" :before-close="closeBox" :close-on-click-modal="false" width="800px">
+       <el-form>
         <WarehouseRecordDetailItem
             v-for="(item, index) in boxData"
             :key="index" v-model="boxData[index]"
             :index="index" :attr-list="attrList"
             :readonly="true"
         />
+        </el-form>
     </el-dialog>
     </div>
 </template>