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

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

@@ -60,6 +60,14 @@
           <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="airCheckoutObj.checkoutTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
 
+      <el-form-item :label="$t('计划箱数')" prop="planNum">
+        <el-input-number v-model="airCheckoutObj.planNum" :controls="false" :precision="0" disabled />
+      </el-form-item>
+
+      <el-form-item :label="$t('出仓箱数')" prop="realNum">
+        <el-input-number v-model="airCheckoutObj.realNum" :controls="false" :precision="0" />
+      </el-form-item>
+
       <el-form-item :label="$t('出仓影像')">
         <ImageUpload :limit="1" :isShowTip=false v-model="airCheckoutObj.checkoutFiles" />
       </el-form-item>
@@ -113,6 +121,8 @@ export default {
     let oldData = { ...this.$attrs.shipmentObj[voName] };
     oldData = formatDateStr(oldData, ["checkoutTime"]);
     this.airCheckoutObj = oldData;
+    this.$set(this.airCheckoutObj, 'planNum', this.$attrs.shipmentObj.planNum)
+    this.$set(this.airCheckoutObj, 'realNum', this.$attrs.shipmentObj.realNum)
 
     let shipmentdData = { ...this.$attrs.shipmentObj["boxAirShipmentBackVO"] };
     shipmentdData = formatDateStr(shipmentdData, ["deliverTime"]);
@@ -124,6 +134,10 @@ export default {
     onSubmit(operateType) {
       this.$refs["airCheckoutForm"].validate((valid) => {
         if (valid) {
+          if(this.airCheckoutObj.planNum != this.airCheckoutObj.realNum){
+            this.$message.error(this.$t("出仓件数与计划出仓件数不一致，请检查"));
+            return;
+          }
           airCheckoutCreate({
             ...this.airCheckoutObj,
             shipmentId: this.$attrs.shipmentObj.id,

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

@@ -118,7 +118,7 @@
           <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>
+        <el-dialog :title="$t('封箱标签')" :visible.sync="printdialogVisible" width="350px" :modal-append-to-body="false" append-to-body>
           <print-tag v-if="printdialogVisible" :tagData="tagData" />
         </el-dialog>
 
@@ -129,7 +129,7 @@
               <el-radio-button :label="2">{{ $t('已装箱列表') }}</el-radio-button>
             </el-radio-group>
           </div>
-          <pkg-page :pkgData="showPkgData" :shipmentObj="shipmentObj" flag="show" @closeDialog="closeDialog" @reload="getList" />
+          <pkg-page v-if="showPagedialogVisible" :pkgData="showPkgData" :shipmentObj="shipmentObj" flag="show" @closeDialog="closeDialog" @reload="getList" />
         </el-dialog>
 
         <el-row style="margin-top: 15px" class="operate-button">

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

@@ -122,7 +122,7 @@
           </div>
         </el-dialog>
         <!-- 打印标签 -->
-        <el-dialog :title="$t('集运封箱标签')" :visible.sync="printdialogVisible" width="350px" :modal-append-to-body="false" append-to-body>
+        <el-dialog :title="$t('封箱标签')" :visible.sync="printdialogVisible" width="350px" :modal-append-to-body="false" append-to-body>
           <print-tag v-if="printdialogVisible" :tagData="tagData" />
         </el-dialog>
     </el-row>

src/views/ecw/box/shippingAir/seaProcess.vue

@@ -186,6 +186,10 @@ export default {
           break;
         // 清关
         case "cusClearance":
+          if(!this.shipmentObj.sapStatus || this.shipmentObj.sapStatus <= 151){
+            this.$message.error(this.$t("请先完成到港操作"));
+            return;
+          }
           this.$set(this.dialogConfig, "width", "700px");
           break;
         // AGENT
@@ -220,6 +224,10 @@ export default {
           break;
         // 卸柜
         case "unloading":
+          if(!this.shipmentObj.sapStatus || this.shipmentObj.sapStatus <= 151){
+            this.$message.error(this.$t("请先完成到港操作"));
+            return;
+          }
           // 卸柜反审
           const unStatus = this.shipmentObj[node.keyName];
           if ([186].includes(unStatus)) {

src/views/ecw/order/prepayDeal.vue

@@ -1471,8 +1471,9 @@
             }
             this.handlerParams.channelPriceList = []
             let priceUnit = false
+
             this.handlerParams.orderItemVOList.map(v=>{
-              if(!v.seaFreightCurrency||!v.seaFreightVolume||!v.clearanceFreightCurrency||v.clearanceFreightVolume){
+              if(!v.seaFreightCurrency||!v.seaFreightVolume||!v.clearanceFreightCurrency||!v.clearanceFreightVolume){
                 priceUnit = true
               }
               var listItem = {