Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/box/indexAir.vue

@@ -8,6 +8,11 @@
       <el-form-item :label="$t('柜号')" prop="cubNo">
         <el-input v-model="queryParams.cubNo" :placeholder="$t('请输入柜号')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <el-form-item :label="$t('出货渠道')" prop="shippingChannelId">
+        <el-select v-model="queryParams.shippingChannelId" :placeholder="$t('请选择出货渠道')">
+          <el-option v-for="item in channelList" :label="$l(item, 'name')" :value="item.channelId" :key="item.channelId"></el-option>
+        </el-select>
+      </el-form-item>
 
       <el-form-item :label="$t('始发地')" prop="startWarehouseId">
         <el-select v-model="queryParams.startWarehouseId" :placeholder="$t('请选择始发地')">
@@ -78,12 +83,12 @@
         </template>
       </el-table-column>
 
-      <el-table-column :label="$t('方数（预装/已装）')" align="center" prop="">
+      <el-table-column :label="$t('方数（分拣/已装）')" align="center" prop="">
         <template slot-scope="{row}">
           {{row.boxStatistics.volume}}/{{row.boxStatistics.loadVolume}}
         </template>
       </el-table-column>
-      <el-table-column :label="$t('重量（预装/已装）')" align="center" prop="weight">
+      <el-table-column :label="$t('重量（分拣/已装）')" align="center" prop="weight">
         <template slot-scope="{row}">
           {{row.boxStatistics.weight}}/{{row.boxStatistics.loadWeight}}
         </template>

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

@@ -33,6 +33,7 @@
               "
               >{{ $t('新建合包箱号') }}</el-button
             >
+            <el-button class="ml-10" @click="pack">{{$t('补单')}}</el-button>
           </el-row>
           <el-row style="margin-top: 5px">
             <el-table border :data="pagList" max-height="600px">
@@ -108,7 +109,6 @@
               <el-radio-button :label="1">{{ $t('未装箱列表') }}</el-radio-button>
               <el-radio-button :label="2">{{ $t('已装箱列表') }}</el-radio-button>
             </el-radio-group>
-            <el-button class="ml-10" @click="pack">{{$t('补单')}}</el-button>
           </div>
           <un-pkg-page v-if="pkgPageType == 1" :pkgData="pkgData" :shipmentObj="shipmentObj" />
           <pkg-page v-if="pkgPageType == 2" :pkgData="pkgData" :shipmentObj="shipmentObj" @closeDialog="closeDialog" />

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

@@ -67,7 +67,7 @@
               </el-form-item>
 							<el-form-item :label="$t('出货渠道')" prop="orderNo">
 								<el-select v-model="queryParams.channelId" clearable :placeholder="$t('请选择出货渠道')">
-                  <el-option v-for="item in channelList" :value="item.channelId">{{$l(item, 'name')}}</el-option>
+                  <el-option v-for="item in channelList" :label="$l(item, 'name')" :value="item.channelId" :key="item.channelId"></el-option>
                 </el-select>
 							</el-form-item>
               <el-form-item>

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

@@ -87,7 +87,7 @@ function airBaseData() {
         /**
          * 合包状态：161待合包   162已合包
          */
-        voName: "trailerInfo",
+        voName: "boxMergePkgBackVO",
         keyName: "mergePkgStatus",
         status: {
           start: [161],
@@ -409,7 +409,7 @@ function airOneData() {
         /**
          * 合包状态：161待合包   162已合包
          */
-        voName: "trailerInfo",
+        voName: "boxMergePkgBackVO",
         keyName: "mergePkgStatus",
         status: {
           start: [161],
@@ -546,28 +546,6 @@ function airOneData() {
         },
       },
     ],
-    [
-      {
-        title: i18n.$t("到港"),
-        imgSrc: {
-          start: require("@/assets/images/shipping/dg-start.png"),
-          wait: require("@/assets/images/shipping/dg-wait.png"),
-          end: require("@/assets/images/shipping/dg-end.png"),
-        },
-        type: "arrival",
-        dataKey: "12", // 字典数据键值
-        /**
-         * 到港状态：151、未到港；152、已到港
-         */
-        voName: "airArrivalInfo",
-        keyName: "sapStatus",
-        status: {
-          start: [151],
-          wait: [],
-          end: [152],
-        },
-      },
-    ],
     [
       {
         title: i18n.$t("结算"),