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

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

@@ -81,7 +81,7 @@
 
     <!-- 开始出仓 -->
     <el-dialog :title="$t('开始出仓')" :visible.sync="dialogVisible" fullscreen :modal-append-to-body=false append-to-body>
-      <startCheckout v-bind="$attrs" v-if="dialogVisible" v-on="$listeners" @closeDialog1="closeDialog1" />
+      <startCheckout v-bind="$attrs" v-if="dialogVisible" v-on="$listeners" @closeDialog1="closeDialog1" @reload="reload" />
     </el-dialog>
 
     <el-row class="operate-button">
@@ -94,6 +94,7 @@
 </template>
 
 <script>
+import { getbox } from "@/api/ecw/box";
 import { airCheckoutCreate } from "@/api/ecw/boxSea";
 import startCheckout from "./checkout/startCheckout.vue";
 import userSelect from "./common/userSelect.vue";
@@ -158,6 +159,12 @@ export default {
         }
       });
     },
+    reload() {
+      getbox(this.$attrs.shipmentObj.id).then((res)=>{
+        this.$set(this.airCheckoutObj, 'planNum', res.data.planNum)
+        this.$set(this.airCheckoutObj, 'realNum', res.data.realNum)
+      })
+    },
     /** 取消 */
     cancel(type) {
       this.$emit("closeDialog", type);

src/views/ecw/box/shippingAir/nodePage/checkout/startCheckout.vue

@@ -5,7 +5,7 @@
             <div><dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="shipmentObj.transportType" />：{{importCityName(shipmentObj.startWarehouseId)}}》{{importCityName(shipmentObj.destWarehouseId)}}【{{getShipChannelName(shipmentObj.channelRespVO.channelId)}}】</div>
             <div>
               <template>
-                <el-input v-model="qrCode" :placeholder="$t('请输入二维码/条码编号')" clearable></el-input>
+                <el-input style="width: 270px;" v-model="qrCode" :placeholder="$t('请输入二维码/条码编号/合包箱号标签')" clearable></el-input>
                 <el-button type="primary" @click="handlerBatchCreate('single')">{{$t('确定')}}</el-button>
                 <el-button type="primary" @click="handlerClick('batchInput',$t('批量输入'))">{{$t('批量输入')}}</el-button>
                 <el-button type="primary" @click="handlerClick('correction',$t('出仓纠错'))">{{$t('出仓纠错')}}</el-button>
@@ -78,6 +78,11 @@
                   {{getTotlContent(scope.row,['weight'])}}
                 </template>
               </el-table-column>
+              <el-table-column :label="$t('合包箱号')" align="center" prop="pkgNum">
+                <template slot-scope="scope">
+                 {{scope.row.pkgNum}}
+                </template>
+              </el-table-column>
             </el-table>
           </el-row>
     </el-card>
@@ -97,7 +102,7 @@
     </el-row>
     <el-row style="margin-top: 20px;">
       <el-button type="primary" @click="submitCheckout">{{$t('确认出仓')}}</el-button>
-      <el-button @click="$emit('closeDialog1')">{{$t('取消')}}</el-button>
+      <el-button @click="closeReload">{{$t('取消')}}</el-button>
     </el-row>
 
 
@@ -114,7 +119,7 @@
       <template v-if="dialogConfig.type === 'correction' && dialogConfig.dialogVisible">
         <el-form ref="correctionForm" :rules="rules" :model="correctionObj" label-position="top">
           <el-form-item :label="$t('出仓纠错（二维码/条形码编号）')" prop="qrCode">
-            <el-input v-model="correctionObj.qrCode" :placeholder="$t('请输入二维码/条形码编号')" clearable />
+            <el-input v-model="correctionObj.qrCode" :placeholder="$t('请输入二维码/条形码编号/合包箱号标签')" clearable />
           </el-form-item>
         </el-form>
         <el-row class="operate-button">
@@ -538,9 +543,13 @@ export default {
     submitCheckout(){
       confirmAirCheckout({shipmentId: this.shipmentObj.id}).then((res) => {
           serviceMsg(res, this).then(() => {
-            this.$emit('closeDialog1')
+            this.closeReload()
           });
         });
+    },
+    closeReload(){
+      this.$emit('closeDialog1')
+      this.$emit('reload')
     }
   },
   computed: {

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

@@ -22,9 +22,10 @@
           <el-table-column align="center" :label="$t('序号')" width="50" type="index" />
           <el-table-column :label="$t('订单号')" align="center" prop="orderNo">
             <template slot-scope="scope">
-              <el-link type="primary" @click.native="orderClick(scope.row)">
-                {{ scope.row.orderNo }}
-              </el-link>
+              <router-link :to="{path: '/order/detail',query: {orderId: scope.row.orderId}}" class="link-type">
+                      <span>{{ scope.row.orderNo }}</span>
+                    </router-link>
+
             </template>
           </el-table-column>
           <el-table-column :label="$t('商品信息')" width="250px" align="center">
@@ -41,7 +42,9 @@
           </el-table-column>
           <el-table-column :label="$t('计划/已装')" align="center" prop="sumNum">
             <template slot-scope="scope">
+              <el-link type="primary" @click.native="orderClick(scope.row)">
              {{ scope.row.sumNum }}/{{ scope.row.installNum }}
+              </el-link>
             </template>
           </el-table-column>
           <el-table-column :label="$t('纸箱尺寸')" align="center">
@@ -51,7 +54,6 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('合包箱号')" align="center" prop="pkg" />
           <el-table-column :label="$t('体积')" align="center" prop="sumVolume" />
           <el-table-column :label="$t('重量')" align="center" prop="sumWeight" />
           <el-table-column :label="$t('数量（个）')" align="center" prop="sumQuantity" />

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

@@ -476,13 +476,15 @@ export default {
     // 理货完成
     tallyFinish() {
       let flag = false
+      let orderNo = ''
       this.checkOrderList.forEach(item=>{
         if(item.installNum != item.num){
           flag = true
+          orderNo = orderNo + '《' + item.orderNo + '》'
         }
       })
       if(flag){
-        this.$message.error(this.$t("仍有订单未理货，请完成所有订单箱号标签扫码后完成理货"));
+        this.$message.error(this.$t(`订单号${orderNo}未完成理货,请完成全部订单理货后重试`));
         return;
       }
       tallyCommit({ shipmentId: this.shipmentObj.id }).then((res) => {