修复空运出货的一些bug

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

@@ -207,7 +207,7 @@ export default {
     onSubmit(operateType) {
       this.$refs['cusClearanceForm'].validate((valid) => {
         if (valid) {
-          if (this.cusClearanceObj.clearanceType == 1) {
+          if (this.cusClearanceObj.clearanceType == 1 && this.cusClearanceObj.clearanceOrderIdList.length > 0) {
             this.$refs['airArrivalForm'].validate((arrvalid) => {
               if (arrvalid) {
                 updateOrderArrival({

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

@@ -111,7 +111,7 @@
             </el-radio-group>
           </div>
           <un-pkg-page v-if="pkgPageType == 1" :pkgData="pkgData" :shipmentObj="shipmentObj" />
-          <pkg-page v-if="pkgPageType == 2" :pkgData="pkgData" :shipmentObj="shipmentObj" @closeDialog="closeDialog" />
+          <pkg-page v-if="pkgPageType == 2" :pkgData="pkgData" :shipmentObj="shipmentObj" @closeDialog="closeDialog" @reload="getList" />
         </el-dialog>
         <!-- 打印标签 -->
         <el-dialog :title="$t('集运封箱标签')" :visible.sync="printdialogVisible" width="350px" :modal-append-to-body="false" append-to-body>

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

@@ -196,6 +196,7 @@ export default {
       deleteRelate(this.pkgData.id, row.orderId).then(() => {
         this.$message.success(this.$t('移出成功'))
         this.getList()
+        this.$emit('reload')
       })
     },
     // 选中

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

@@ -22,7 +22,7 @@
           </el-table-column>
           <el-table-column :label="$t('备案')" align="center">
             <template slot-scope="{ row }">
-              <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.productRecord" />
+              <dict-tag :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="row.productRecord" />
             </template>
           </el-table-column>
           <el-table-column :label="$t('箱数')" align="center" prop="sumNum">

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

@@ -285,7 +285,7 @@
                 <el-table-column :label="$t('包装类型')" align="center" prop="">
                   <template slot-scope="scope">
                     <span v-for="(unit,index) in scope.row.warehouseInInfoVO && scope.row.warehouseInInfoVO.units.split(',')" :key="index">
-                      <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />
+                      <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" /><span v-if="index>0&&index<scope.row.warehouseInInfoVO.units.split(',').length-1">, </span>
                     </span>
                   </template>
                 </el-table-column>