处理空运出货的一些bug

src/views/ecw/box/editAirForm.vue

@@ -71,6 +71,8 @@ export default {
     this.form = { ...this.shipmentObj };
     if(this.form.destinationClearance && this.form.destinationClearance != 3){
       this.form.destinationClearanceSelect = 1
+    }else{
+      this.form.destinationClearanceSelect = 3
     }
     this.getChannelList()
   },

src/views/ecw/box/indexAir.vue

@@ -419,7 +419,10 @@ export default {
       this.$set(this.dialogCfg, 'fullscreen', false)
       this.$set(this.dialogCfg, 'open', true)
       this.currRow = {
-        transportType: '3'
+        transportType: '3',
+        destinationClearanceSelect: 1,
+        destinationClearance: 1,
+        deliveryType: 1
       }
     },
     /** 修改按钮操作 */
@@ -463,7 +466,7 @@ export default {
           return exportboxExcel(params)
         })
         .then((response) => {
-          this.$download.excel(response, '${table.classComment}.xls')
+          this.$download.excel(response, this.$t("空运管理") + ".xls");
           this.exportLoading = false
         })
         .catch(() => {})

src/views/ecw/box/shippingAir/nodePage/mergePkg/pkgPage.vue

@@ -44,7 +44,7 @@
           <el-table-column :label="$t('储位')" align="center" prop="positionNo" width="250px">
             <template slot-scope="{ row }">
               <div v-for="item in row.orderItemDOS" :key="item.orderItemId">
-                {{ notset(item.positionNo) }}
+                {{ notset(getpositionNo(item.warehouseInInfoVO.orderLocationMergeVOSet)) }}
               </div>
             </template>
           </el-table-column>
@@ -184,6 +184,14 @@ export default {
       })
       return arr.toString()
     },
+    getpositionNo(arr){
+      if(!arr) return arr
+      let data = []
+      arr.forEach(item=>{
+        data.push(item.areaName+item.locationName)
+      })
+      return data.toString()
+    },
     removePkg(row) {
       deleteRelate(this.pkgData.id, row.orderId).then(() => {
         this.$message.success(this.$t('移出成功'))

src/views/ecw/box/shippingAir/nodePage/mergePkg/unPkgPage.vue

@@ -112,7 +112,7 @@ export default {
       if(!arr) return arr
       let data = []
       arr.forEach(item=>{
-        data.push(item.locationName)
+        data.push(item.areaName+item.locationName)
       })
       return data.toString()
     },

src/views/ecw/box/shippingAir/nodePage/subMaterial.vue

@@ -127,7 +127,7 @@ export default {
     });
     const voName = this.$attrs.currNode.voName;
     let oldData = { ...this.shipmentObj[voName] };
-    if(oldData.issueType == 0) oldData.issueType = 2
+    if(!oldData.issueType || oldData.issueType == 0) oldData.issueType = 2
     oldData = formatNumberString(oldData, ["issueType"]);
     this.subMaterialObj = {
       ...oldData,

src/views/ecw/box/shippingAir/utils.js

@@ -666,11 +666,11 @@ const constantDict = {
   billingMethod: [
     {
       value: "1",
-      label: i18n.$t("电放"),
+      label: i18n.$t("正本"),
     },
     {
       value: "2",
-      label: i18n.$t("正本"),
+      label: i18n.$t("电放"),
     },
   ],
   // 是否有文件