报关》异常》敏感货》删单退场错误

src/views/ecw/box/queryAir.vue

@@ -494,7 +494,7 @@ export default {
           break;
 
         case "router":
-          this.$router.push("/boxSea/shippingSea/" + this.shipmentId);
+          this.$router.push("/boxAir/shippingAir/" + this.shipmentId);
           break;
 
         case "cost":

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

@@ -70,7 +70,7 @@
           {{getCheckExamineStatus}}
         </el-form-item>
       </el-form-item>
-      <el-form-item v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 1">
+      <el-form-item v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 1 && shipmentObj.overMachineExamineStatus == 0 && (typeof cusDeclarationObj.id != 'undefined')">
         <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">
@@ -106,11 +106,8 @@
       </el-form-item>
 
     </el-form>
-    <el-row class="operate-button" v-if="inReview">
-      <el-button type="primary" @click="jumpReviewDetail">{{cusDeclarationObj.dcCheckStatus === '1' ? $t('全部退场审核中') : $t('部分退场审核中')}}</el-button>
-      <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="inReview" plain @click="canclAudit">{{$t('取消删单退场审核')}}</el-button>
       <el-button type="primary" @click="onSubmit(1)" :disabled="isCheckDeal('submit')">{{$t('保存')}}</el-button>
       <el-button type="success" v-if="!inReview" @click="onSubmit(2)" :disabled="isCheckDeal('submit')">{{$t('提交')}}</el-button>
       <el-button @click="cancel">{{$t('关闭')}}</el-button>
@@ -289,10 +286,15 @@ export default {
     oldData.overDealUser = this.strToArray(oldData.overDealUser)
     oldData.overOrders = this.strToArray(oldData.overOrders)
 
-    this.cusDeclarationObj = oldData;console.log(this.cusDeclarationObj.overDealUser)
+    this.cusDeclarationObj = oldData;
+    if(this.shipmentObj.overMachineExamineStatus == 1){
+      this.$set(this.cusDeclarationObj, "overMachineStatus", 2)
+      this.$set(this.cusDeclarationObj, "overMachineAbnormalStatus", 1)
+    }
   },
   methods: {
     strToArray(str) {
+      if(!str) return []
       let array = str?.split(",") ?? []
       return array.map(item=>{return Number(item)})
     },
@@ -398,18 +400,18 @@ export default {
           }
           // 3.查验状态，查验后放行 直接提交
           if (dcCheckStatus === "3") {
-            const { checkExamineStatus } = this.shipmentObj;
+            const { overMachineExamineStatus } = this.shipmentObj;
             // 没有退场审核中的状态
-            if (checkExamineStatus !== 1) {
+            if (overMachineExamineStatus !== 1) {
               this.submitCustomsCreate(operateType);
               return;
             }
           }
           // 4.查验状态，退场/部分退场 提示
           if (["1", "2"].includes(dcCheckStatus)) {
-            const { checkExamineStatus } = this.shipmentObj;
+            const { overMachineExamineStatus } = this.shipmentObj;
             // 退场审核状态,1-审核中，2-审核成功，3-审核失败，4-取消
-            if ([0, 2, 3, 4].includes(checkExamineStatus)) {
+            if ([0, 2, 3, 4].includes(overMachineExamineStatus)) {
               this.$modal
                 .confirm(this.$t(
                   `您确认提交${
@@ -557,9 +559,10 @@ export default {
     },
     /* 取消审核 */
     canclAudit() {
+      console.log(this.shipmentObj)
       approvalCancel({
         applyReason: this.$t("取消审核"),
-        id: this.shipmentObj["customsApprovalInfo"].id,
+        id: this.shipmentObj["customsDeleteExitApprovalInfo"].id,
         shipmentId: this.shipmentObj.id,
       }).then((res) => {
         serviceMsg(res, this).then(() => {
@@ -571,11 +574,11 @@ export default {
     },
     /* 判断查验选择是否禁用 */
     disabledRadio(item) {
-      const { checkExamineStatus, checkDealStatus, customsInfo } =
+      const { overMachineExamineStatus, checkDealStatus, customsInfo } =
         this.shipmentObj;
       const { dcCheckStatus } = customsInfo ?? {}; // 部分退场状态并且审核通过，退场不可选择
       if (
-        checkExamineStatus === 2 &&
+        overMachineExamineStatus === 2 &&
         dcCheckStatus === 2 &&
         checkDealStatus === 0 &&
         item.value === "1"
@@ -626,8 +629,8 @@ export default {
       immediate: true,
       handler: function (val) {
         // 监听查验状态变化
-        let { checkExamineStatus } = val;
-        if (checkExamineStatus === 1) {
+        let { overMachineExamineStatus } = val;
+        if (overMachineExamineStatus === 1) {
           // 按钮变成审核中
           this.inReview = true;
         }
@@ -652,15 +655,15 @@ export default {
   computed: {
     /* 获取报关审核退场状态文字 */
     getCheckExamineStatus() {
-      const { checkExamineStatus, checkDealStatus, customsInfo } =
+      const { overMachineExamineStatus, checkDealStatus, customsInfo } =
         this.shipmentObj;
       const { dcCheckStatus } = customsInfo ?? {};
-      if (checkExamineStatus === 1) {
+      if (overMachineExamineStatus === 1) {
         return dcCheckStatus === 1
           ? this.$t("退场审核中")
           : this.$t("部分退场审核中");
       }
-      if (checkExamineStatus === 2 && checkDealStatus === 0) {
+      if (overMachineExamineStatus === 2 && checkDealStatus === 0) {
         return dcCheckStatus === 1
           ? this.$t("审核通过，退场中")
           : this.$t("审核通过，部分退场中");
@@ -670,7 +673,7 @@ export default {
     /* 判断是否已处理 */
     isCheckDeal() {
       return (type) => {
-        const { checkExamineStatus, checkDealStatus, customsInfo } =
+        const { overMachineExamineStatus, checkDealStatus, customsInfo } =
           this.shipmentObj;
         const { dcCheckStatus } = customsInfo ?? {};
 
@@ -678,7 +681,7 @@ export default {
         if (type === "status") {
           // 退场/部分退场 审核通过未处理，禁用
           if (
-            checkExamineStatus === 2 &&
+            overMachineExamineStatus === 2 &&
             [1, 2].includes(dcCheckStatus) &&
             checkDealStatus === 0
           ) {
@@ -691,7 +694,7 @@ export default {
           // 退场 审核通过未处理，禁用
           // 部分退场 审核通过未处理，由 disabledRadio 方法判断
           if (
-            checkExamineStatus === 2 &&
+            overMachineExamineStatus === 2 &&
             [1].includes(dcCheckStatus) &&
             checkDealStatus === 0
           ) {
@@ -703,7 +706,7 @@ export default {
         if (type === "submit") {
           const { dcCheckStatus: newCheckStatus } = this.cusDeclarationObj;
           // 退场/部分退场 审核通过未处理
-          if (checkExamineStatus === 2 && checkDealStatus === 0) {
+          if (overMachineExamineStatus === 2 && checkDealStatus === 0) {
             // 退场，禁用
             if (dcCheckStatus === 1) return true;
             // 部分退场

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

@@ -122,7 +122,7 @@
           </div>
         </el-dialog>
         <!-- 打印标签 -->
-        <el-dialog :title="$t('集运封箱标签')" :visible.sync="printdialogVisible" width="300px" :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>