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

src/views/bpm/processInstance/detail.vue

@@ -437,6 +437,12 @@ export default {
         shipment_review:  {
           component: "shippingDetail",
           processId: this.processInstance.businessKey
+        },
+        // 删单退场
+        customs_declare_remove:  {
+          component: "shippingDetail",
+          processId: this.processInstance.businessKey,
+          type: 'deleteExit'
         }
       }
       console.log('formCustomViewPath', this.processInstance.processDefinition.formCustomViewPath.trim())

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

@@ -67,8 +67,12 @@
       </el-form-item>
       <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('退场时间')}}</el-radio>
-          <el-radio :label="2">{{$t('返回仓库')}}</el-radio>
+          <el-radio :label="1">{{$t('退场时间')}}<el-tooltip class="item" effect="dark" :content="$t('选择退场时间，填写退场时间后，提交删单退场审核，订单返回到“已订舱”环节修改订舱号后，提交之后直接到报关流程')" placement="top">
+      <div class="el-icon-question"></div>
+    </el-tooltip></el-radio>
+          <el-radio :label="2">{{$t('返回仓库')}}<el-tooltip class="item" effect="dark" :content="$t('删单退场审核通过后，通过PDA空运退场到仓进行货物入仓')" placement="top">
+      <div class="el-icon-question"></div>
+    </el-tooltip></el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 1 && cusDeclarationObj.deleteExitType == 1" :label="$t('退场时间')">
@@ -79,7 +83,7 @@
           {{getOverExamineStatus}}
         </el-form-item>
       </el-form-item>
-      <el-form-item v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 1 && shipmentObj.overMachineExamineStatus == 0 && (typeof cusDeclarationObj.id != 'undefined')">
+      <el-form-item v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 1 && ![1].includes(shipmentObj.overMachineExamineStatus)">
         <el-button type="primary" @click="approvalCreate">{{$t('提交删单退场审核')}}</el-button>
       </el-form-item>
       <el-form-item prop="weightMisreport"  v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 2">
@@ -120,6 +124,7 @@
       <el-button type="primary" plain @click="canclAudit">{{cusDeclarationObj.dcCheckStatus === '1' ? $t('取消全部退场审核') : $t('取消部分退场审核')}}</el-button>
     </el-row>
     <el-row class="operate-button">
+      <el-button type="primary" v-if="inOverReview" @click="exitReviewDetail">{{$t('删单退场审核中')}}</el-button>
       <el-button type="primary" v-if="inOverReview" plain @click="canclOverAudit">{{$t('取消删单退场审核')}}</el-button>
       <el-button type="primary" @click="onSubmit(1)" :disabled="isCheckDeal('submit')">{{$t('保存')}}</el-button>
       <el-button type="success" v-if="!inReview&&!inOverReview" @click="onSubmit(2)" :disabled="isCheckDeal('submit')">{{$t('提交')}}</el-button>
@@ -308,6 +313,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)
+      }
+    }
   },
   methods: {
     strToArray(str) {
@@ -386,6 +398,9 @@ export default {
     },
     //提交删单退场审核
     approvalCreate(){
+      // this.$refs["cusDeclarationForm"].validate((valid) => {
+      //   if (valid) {}
+      // })
       if(!this.cusDeclarationObj.deleteExitType){
         this.$message.error(this.$t("请选择删单退场类型或者时间"));
         return;
@@ -403,9 +418,8 @@ export default {
             approvalStatus: 0,
             approvalType: 11,
             details: JSON.stringify(details)
-          }).then((res) => {
-            serviceMsg(res, this).then(() => {
-            });
+          }).then(() => {
+            this.onSubmit(1)
           });
     },
     /** 提交 */
@@ -591,6 +605,12 @@ export default {
       toReviewDetail.apply(this, [customsApprovalInfo.bpmProcessId]);
       this.cancel("close");
     },
+    //删单退场审核详情
+    exitReviewDetail() {
+      const { customsDeleteExitApprovalInfo } = this.shipmentObj;
+      toReviewDetail.apply(this, [customsDeleteExitApprovalInfo.bpmProcessId]);
+      this.cancel("close");
+    },
     /* 取消退场审核 */
     canclAudit() {
       console.log(this.shipmentObj)
@@ -723,20 +743,20 @@ export default {
       }
       return this.$t("未审核");
     },
-    /* 获取报关审核退场状态文字 */
+    /* 获取报关审核删单退场状态文字 */
     getOverExamineStatus() {
       const { overMachineExamineStatus, checkDealStatus, customsInfo } =
         this.shipmentObj;
       const { dcCheckStatus } = customsInfo ?? {};
       if (overMachineExamineStatus === 1) {
         return dcCheckStatus === 1
-          ? this.$t("退场审核中")
-          : this.$t("部分退场审核中");
+          ? this.$t("删单退场审核中")
+          : this.$t("删单退场审核中");
       }
       if (overMachineExamineStatus === 2 && checkDealStatus === 0) {
         return dcCheckStatus === 1
-          ? this.$t("审核通过，退场中")
-          : this.$t("审核通过，部分退场中");
+          ? this.$t("删单退场审核通过，退场中")
+          : this.$t("删单退场审核通过，退场中");
       }
       return this.$t("未审核");
     },

src/views/ecw/box/shippingDetail.vue

@@ -194,6 +194,9 @@ export default {
         if (this.type === "shipment") {
           this.getShipmentDetail();
         }
+        if (this.type === "deleteExit") {
+          this.getDeleteExit();
+        }
       });
     },
     getShipmentDetail(){

src/views/ecw/order/batchSingleApplication.vue

@@ -261,7 +261,7 @@ export default {
         if (r.code === 0) {
           this.$emit('getList')
           this.$emit('update:dialogVisible', false)
-          this.$message.success(this.$t('调仓申请提交成功，请耐心等待审核'));
+          this.$message.success(r.data);
 
         }
       })

src/views/ecw/order/warehousing/components/Warehouse.vue

@@ -743,10 +743,15 @@ export default {
       this.form.orderId = this.warehousing.orderId
       this.form.orderItemId = this.warehousing.orderItemId
       this.form.orderNo = this.warehousing.orderNo
-      this.form.warehouseInProdAttrIds =
-        this.warehousing.warehouseInProdAttrIds?.split(',').map(e => +e)
-        || this.warehousing.prodAttrIds?.split(',').map(e => +e)
-        || []
+      if (this.edit || this.isAdd) {
+        this.form.warehouseInProdAttrIds = this.warehousing.warehouseInProdAttrIds?.split(',').map(e => +e) || []
+      } else {
+        this.form.warehouseInProdAttrIds =
+          this.warehousing.warehouseInProdAttrIds?.split(',').map(e => +e)
+          || this.warehousing.prodAttrIds?.split(',').map(e => +e)
+          || []
+      }
+
       this.form.prodId = this.warehousing.prodId
       this.form.prodTitleEn = this.warehousing.prodTitleEn
       this.form.prodTitleZh = this.warehousing.prodTitleZh