解决空运出货的一些bug

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

@@ -26,6 +26,7 @@
               type="primary"
               @click="
                 addMergedialogVisible = true
+                isMergeEdit = false
                 addMergeForm = {}
                 mergeTitle = $t('新建合包箱号')
               "

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

@@ -43,7 +43,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>
@@ -108,6 +108,14 @@ export default {
       })
       return arr.toString()
     },
+    getpositionNo(arr){
+      if(!arr) return arr
+      let data = []
+      arr.forEach(item=>{
+        data.push(item.locationName)
+      })
+      return data.toString()
+    },
     addPkg(row) {
       let data = {
         pkgId: this.pkgData.id,

src/views/ecw/box/shippingAir/seaStepDetail.vue

@@ -2,7 +2,7 @@
   <div class="app-seaStepDetail">
     <el-scrollbar :vertical="true" viewClass="shipping-step">
       <template v-for="(step, index) in flatSeaStep">
-        <div :key="index" v-if="shipmentObj[step.voName] && columnsMapping[step.voName] && checkPermi(['box:'+step.type+':show'])" class="step-table">
+        <div :key="index" v-if="shipmentObj[step.voName] && columnsMapping[step.voName] && checkPermi(['boxAir:'+step.type+':show'])" class="step-table">
           <div class="step-title">{{step.title}}</div>
           <div v-for="(data, index) in columnsMapping[step.voName]" :key="index" class="step-content">
             <p>{{data.title}}</p>

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

@@ -29,7 +29,7 @@
         <seaProcess :seaBaseData="seaBaseData" :shipmentObj="shipmentObj" :allSupplier="allSupplier" :allDocks="allDocks" :allUsers="allUsers" :allLading="allLading" :warehouseList="warehouseList" @getBoxInfo="getBoxInfo" />
 
         <!-- 海运步骤图 -->
-        <seaStepDetail :seaBaseData="seaBaseData" :shipmentObj="shipmentObj" :allSupplier="allSupplier" :allDocks="allDocks" :allUsers="allUsers" :warehouseList="warehouseList" />
+        <seaStepDetail v-if="seaBaseData.length>0" :seaBaseData="seaBaseData" :shipmentObj="shipmentObj" :allSupplier="allSupplier" :allDocks="allDocks" :allUsers="allUsers" :warehouseList="warehouseList" />
       </el-col>
     </el-row>
   </div>