修复空运的bug

src/views/ecw/box/queryAir.vue

@@ -108,7 +108,7 @@
               <el-table-column prop="" :label="$t('操作')" align="center" width="120px">
                 <template slot-scope="scope">
                   <el-button type="primary" size="small" :disabled="scope.row.abnormalDealStatus === 1" @click="()=>updateStatus('single', scope.row)">{{$t('更新状态')}}</el-button>
-                  <el-button type="primary" size="small" :disabled="!(shipmentObj.clStatus!=132&&shipmentObj.clearanceInfo&&(shipmentObj.clearanceInfo.clearanceOrderList.findIndex(ff=>ff.orderId == scope.row.orderId) !== -1))" @click="()=>cancleClear(scope.row)">{{$t('撤销清关申请')}}</el-button>
+                  <el-button type="primary" size="small" :disabled="shipmentObj.clStatus==132||(shipmentObj.clearanceInfo&&shipmentObj.clearanceInfo.clearanceOrderList.findIndex(ff=>ff.orderId == scope.row.orderId) == -1)" @click="()=>cancleClear(scope.row)">{{$t('撤销清关申请')}}</el-button>
                 </template>
               </el-table-column>
             </el-table>

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

@@ -2,7 +2,7 @@
   <div>
     <el-form ref="cDocForm" :model="cDocObj" label-width="100px">
       <el-form-item :label="$t('出单方式')">
-        {{method.find(item=>item.value = cDocObj.cdOutBillType).label}}
+        {{method.find(item=>item.value == cDocObj.cdOutBillType).label}}
       </el-form-item>
 
       <template v-if="cDocObj.cdOutBillType === '1'">
@@ -35,7 +35,7 @@
         <FileUpload :limit="1" :isShowTip=false v-model="cDocObj.cdAgentlistFile" :fileType="fileType" />
       </el-form-item>
 
-      <el-form-item label="soncap">
+      <!-- <el-form-item label="soncap">
         <el-radio-group v-model="cDocObj.cdSoncapType">
           <el-radio v-for="item in status" :key="item.value" :label="item.value">{{item.label}}</el-radio>
         </el-radio-group>
@@ -45,7 +45,7 @@
       </el-form-item>
       <el-form-item>
         <FileUpload :limit="1" :isShowTip=false v-model="cDocObj.cdSoncapFile" :fileType="fileType" />
-      </el-form-item>
+      </el-form-item> -->
 
     </el-form>
     <el-row class="operate-button">
@@ -105,7 +105,7 @@ export default {
       cdOutBillType:
         oldData.cdOutBillType === 0 ? undefined : oldData.cdOutBillType,
     };
-    this.$set(this.cDocObj,'cdOutBillType',2)
+    this.$set(this.cDocObj,'cdOutBillType','2')
   },
   methods: {
     /** 提交 */

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

@@ -65,7 +65,7 @@
           <el-radio :label="2">{{ $t('重量误报') }}</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 1" :label="$t('删单退场类型')">
+      <!-- <el-form-item v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 1" :label="$t('删单退场类型')">
         <el-radio-group v-model="cusDeclarationObj.deleteExitType" :disabled="inReview || inOverReview">
           <el-radio :label="1"
             >{{ $t('退场时间')
@@ -81,7 +81,7 @@
       </el-form-item>
       <el-form-item v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 1 && cusDeclarationObj.deleteExitType == 1" :label="$t('退场时间')">
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cusDeclarationObj.deleteExitTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 1">
         <el-form-item :label="$t('删单退场状态')">
           {{ getOverExamineStatus }}
@@ -280,13 +280,13 @@ export default {
       this.$set(this.cusDeclarationObj, 'overMachineStatus', 2)
       this.$set(this.cusDeclarationObj, 'overMachineAbnormalStatus', 1)
     }
-    if (this.shipmentObj.customsDeleteExitApprovalInfo) {
-      if (this.shipmentObj.customsDeleteExitApprovalInfo.details) {
-        let details = JSON.parse(this.shipmentObj.customsDeleteExitApprovalInfo.details)
-        this.$set(this.cusDeclarationObj, 'deleteExitType', details.deleteExitType)
-        this.$set(this.cusDeclarationObj, 'deleteExitTime', details.deleteExitTime)
-      }
-    }
+    // if (this.shipmentObj.customsDeleteExitApprovalInfo) {
+    //   if (this.shipmentObj.customsDeleteExitApprovalInfo.details) {
+    //     let details = JSON.parse(this.shipmentObj.customsDeleteExitApprovalInfo.details)
+    //     this.$set(this.cusDeclarationObj, 'deleteExitType', details.deleteExitType)
+    //     this.$set(this.cusDeclarationObj, 'deleteExitTime', details.deleteExitTime)
+    //   }
+    // }
     boxGoodsDetail({
       shipmentId: this.shipmentObj.id,
       secId: 0
@@ -382,17 +382,16 @@ export default {
     approvalCreate() {
       this.$refs['cusDeclarationForm'].validate((valid) => {
         if (valid) {
-          if (!this.cusDeclarationObj.deleteExitType) {
-            this.$message.error(this.$t('请选择删单退场类型或者时间'))
-            return
-          }
-          if (this.cusDeclarationObj.deleteExitType == 1 && !this.cusDeclarationObj.deleteExitTime) {
-            this.$message.error(this.$t('请选择退场时间'))
-            return
-          }
+          // if (!this.cusDeclarationObj.deleteExitType) {
+          //   this.$message.error(this.$t('请选择删单退场类型或者时间'))
+          //   return
+          // }
+          // if (this.cusDeclarationObj.deleteExitType == 1 && !this.cusDeclarationObj.deleteExitTime) {
+          //   this.$message.error(this.$t('请选择退场时间'))
+          //   return
+          // }
           let details = {
-            deleteExitType: this.cusDeclarationObj.deleteExitType,
-            deleteExitTime: this.cusDeclarationObj.deleteExitTime
+            deleteExitType: 2
           }
           approvalCreate({
             shipmentId: this.shipmentObj.id,

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

@@ -87,7 +87,7 @@
                 </div>
                 <div>{{$t('入仓时间')}}：{{formatDate(item.rucangTime)}}</div>
                 <div>
-                  <el-button type="text" @click="handleGoods('all', item)">[{{$t('全部预装')}}]</el-button>
+                  <el-button v-if="toBePreList.sectionGoodList&&item.airShipment==4" type="text" @click="handleGoods('all', item)">[{{$t('全部分拣')}}]</el-button>
                   <el-button type="text" @click="foldTable(index, item)">[{{item.fold ? $t('展开') : $t('收起')}}]</el-button>
                 </div>
               </el-row>
@@ -117,13 +117,13 @@
                         <p v-if="scope.row.weight">{{getTotlContent(scope.row,['weight'])}}</p>
                       </template>
                     </el-table-column>
-                    <!-- <el-table-column :label="$t('预装柜')"
+                    <!-- <el-table-column :label="$t('分拣柜')"
                                      align="center"
                                      prop=""
                                      width="120">{{ $t('无返回') }}</el-table-column> -->
                     <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="100">
                       <template slot-scope="scope">
-                        <el-button type="text" size="small" @click="handleGoods('singele',scope.row)">{{$t('预装')}}</el-button>
+                        <el-button v-if="toBePreList.sectionGoodList&&item.airShipment==4" type="text" size="small" @click="handleGoods('singele',scope.row)">{{$t('分拣')}}</el-button>
                       </template>
                     </el-table-column>
                   </el-table>
@@ -201,7 +201,7 @@ export default {
         startWarehouseId: this.$attrs.shipmentObj.startWarehouseId,
       },
       pageParam: { pageNo: 1, pageSize: 10 },
-      // 待预装
+      // 待分拣
       toBePreList: [],
       total: 0,
       loading: false,
@@ -236,7 +236,7 @@ export default {
       }
       this.queryAllData();
     },
-    /* 查询已预装 */
+    /* 查询已分拣 */
     getSecGoods() {
       loadSecGoodsList({ shipmentId: this.$attrs.shipmentObj.id }).then(
         (res) => {
@@ -261,7 +261,7 @@ export default {
         }
       );
     },
-    /* 查询待预装 */
+    /* 查询待分拣 */
     getPreLoad() {
       this.loading = true;
       // 处理查询参数
@@ -315,7 +315,7 @@ export default {
             }
       });
     },
-    /** 预装 */
+    /** 分拣 */
     handleGoods(type, item) {
       let params = {
         secId: this.partData.id,
@@ -375,10 +375,10 @@ export default {
             }
 
             if (res.code === 566) {
-              this.$confirm(res.msg+this.$t('是否需要一起预装?'), this.$t("提示"), {
+              this.$confirm(res.msg+this.$t('是否需要一起分拣?'), this.$t("提示"), {
                 dangerouslyUseHTMLString: true,
                 distinguishCancelAndClose: true,
-                confirmButtonText: '预装关联单',
+                confirmButtonText: '分拣关联单',
                 cancelButtonText: '仅当前订单'
               })
                 .then((_) => {
@@ -414,7 +414,7 @@ export default {
     /* 删除部分 */
     deletePart() {
       this.$confirm(
-        this.$t("确认删除该部分及其已预装订单？"),
+        this.$t("确认删除该部分及其已分拣订单？"),
         this.$t("提示"),
         {
           type: "warning",
@@ -453,7 +453,7 @@ export default {
       var arr = this.$attrs.warehouseList.filter((item) => item.id == id);
       return arr.length > 0 ? this.$l(arr[0], "title") : this.$t("无");
     },
-    /* 待预装订单分页 */
+    /* 待分拣订单分页 */
     pageChange(page) {
       this.pageParam.pageNo = page;
       this.getPreLoad();

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

@@ -16,8 +16,8 @@
       <el-form-item :label="$t('目的港')">
         <dockSelect v-model="subMaterialObj.destPortId" :placeholder="$t('请选择目的港')" :allDocks="this.$attrs.allDocks" />
       </el-form-item>
-      <el-form-item :label="$t('船公司')">
-        <supplierSelect v-model="subMaterialObj.shipCompanyId" :companyType="'9'" :placeholder="$t('请选择船公司')" :allSupplier="this.$attrs.allSupplier" />
+      <el-form-item :label="$t('航空公司')">
+        <supplierSelect v-model="subMaterialObj.shipCompanyId" :companyType="'9'" :placeholder="$t('请选择航空公司')" :allSupplier="this.$attrs.allSupplier" />
       </el-form-item>
       <el-form-item :label="$t('托运人')">
         <ladingSelect v-model="subMaterialObj.shipperId" :placeholder="$t('请选择托运人')" :allUsers="this.$attrs.allLading" />
@@ -46,12 +46,12 @@
       <el-form-item :label="$t('货物描述')">
         <el-input v-model="subMaterialObj.goodsDesc" type="textarea" autosize :placeholder="$t('请输入货物描述')"></el-input>
       </el-form-item>
-      <el-form-item :label="$t('柜号') + '/' + $t('封条')">
+      <!-- <el-form-item :label="$t('柜号') + '/' + $t('封条')">
         <el-input v-model="subMaterialObj.containerSealNo" :placeholder="$t('请输入柜号') + '/' + $t('封条')"></el-input>
       </el-form-item>
       <el-form-item :label="$t('柜型')">
         {{cabinetType}}
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item :label="$t('出单方式')">
         <el-radio-group v-model="subMaterialObj.issueType">
           <el-radio v-for="item in method" :key="item.value" :label="item.value">{{item.label}}</el-radio>