修复空运出货的一些bug

src/views/ecw/box/shippingAir/nodePage/common/ordersSelect.vue

@@ -4,12 +4,9 @@
         multiple
         filterable
         clearable
-        remote
         reserve-keyword
         :disabled="disabled"
         :placeholder="$t('请输入订单号')"
-        @focus="remoteMethod('')"
-        :remote-method="remoteMethod"
         :loading="loading">
         <el-option
         v-for="(item) in list"
@@ -20,14 +17,16 @@
     </el-select>
 </template>
 <script>
-import {getOrderPage, getOrderList} from '@/api/ecw/order'
-
+import { boxGoodsDetail } from "@/api/ecw/boxSea";
 export default {
     props:{
         value: [Array],
         disabled: {
             type: Boolean,
             default: false
+        },
+        shipmentId: {
+            type: Number
         }
     },
     data(){
@@ -43,32 +42,20 @@ export default {
         },
         value(val){
             this.valueSync = this.value
-            this.init(val)
         }
     },
     created(){
+        this.remoteMethod()
         this.valueSync = this.value
-        this.init(this.value)
     },
     methods:{
-        init(val){
-            if(val === null || val == undefined || val == '') return
-            let params = {
-                ids: val.toString()
-            }
-            getOrderList(params).then(res => {
-                this.list = res.data
-            })
-        },
-        remoteMethod(keyword){
-            let params = {
-                pageSize: 10,
-            }
-            params.orderNo = keyword
-            this.loading = true
-            getOrderPage(params)
-                .then(res => this.list = res.data.list)
-                .finally(() => this.loading = false)
+        remoteMethod(){
+            boxGoodsDetail({
+                shipmentId: this.shipmentId,
+                secId: 0
+            }).then((res) => {
+                this.list = res.data.sectionOrderList;
+            });
         }
     }
 }

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

@@ -95,7 +95,7 @@
         <el-input v-model="cusDeclarationObj.overRemarks" style="width: 180px" />
       </el-form-item>
       <el-form-item :label="$t('超重订单')" prop="overOrders"  v-show="cusDeclarationObj.overMachineStatus == 2&&cusDeclarationObj.weightMisreport == 4">
-        <ordersSelect v-model="cusDeclarationObj.overOrders" :placeholder="$t('请选择超重订单')" :allUsers="this.$attrs.allUsers" />
+        <ordersSelect v-model="cusDeclarationObj.overOrders" :placeholder="$t('请选择超重订单')" :shipmentId="shipmentObj.id" />
       </el-form-item>
 
       <!-- <el-form-item :label="$t('装箱单')">
@@ -423,8 +423,11 @@ export default {
                   }审核吗？`)
                 )
                 .then(() => {
+                  let parems = {... this.cusDeclarationObj}
+                  parems.overDealUser = !Array.isArray(parems.overDealUser)?null:parems.overDealUser.join(',')
+                  parems.overOrders = !Array.isArray(parems.overOrders)?null:parems.overOrders.join(',')
                   customsCreate({
-                    ...this.cusDeclarationObj,
+                    ...parems,
                     shipmentId: this.shipmentObj.id,
                     operateType,
                   }).then((res) => {

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

@@ -46,6 +46,10 @@
         <el-input v-model="queryParams.weightRatioMin" :placeholder="$t('请输入 小')" clearable />
       </el-form-item>
 
+      <el-form-item prop="airShipment">
+        <el-radio v-model="queryParams.airShipment" :label="4">{{$t('已完成备货')}}</el-radio>
+      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery('pre')">{{$t('搜索已分拣订单')}}</el-button>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery('toBePre')">{{$t('搜索待分拣订单')}}</el-button>
@@ -587,7 +591,7 @@ export default {
           ...this.operatorData,
           applyReason: this.$t("分拣审核"),
           approvalStatus: 0,
-          approvalType: 1, // 分拣
+          approvalType: 13, // 分拣
           copyUserId: this.selectedUsers,
           shipmentId: this.$attrs.shipmentObj.id,
         }).then((res) => {

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

@@ -92,7 +92,7 @@ export default {
       this.$refs["reviewForm"].validate((valid) => {
         if (valid) {
           const { currNode, shipmentObj } = this.$attrs;
-          let approvalType = 4; // 预装反审
+          let approvalType = 14; // 预装反审
           if (currNode.type === "cabinet") approvalType = 9; // 装柜反审
           if (currNode.type === "unloading") approvalType = 7; // 卸柜反审核
 

src/views/ecw/box/shippingDetail.vue

@@ -6,9 +6,9 @@
       <el-descriptions-item :label="$t('运输方式')">
         <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="boxBackVO.transportType" />
       </el-descriptions-item>
-      <!-- <el-descriptions-item :label="$t('出货渠道')">
+      <el-descriptions-item :label="$t('出货渠道')">
         {{getShipChannelName(boxBackVO.shippingChannelId)}}
-      </el-descriptions-item> -->
+      </el-descriptions-item>
       <el-descriptions-item :label="$t('柜型')">
         {{cabinetLabel}}
       </el-descriptions-item>