Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/box/shippingSea/nodePage/review.vue

@@ -33,7 +33,11 @@ export default {
   },
   created() {
     const { currNode, shipmentObj } = this.$attrs;
-    const { preInstallBackInfo, cabinetUnloadBackApprovalInfo } = shipmentObj;
+    const {
+      preInstallBackInfo,
+      cabinetBackInfo,
+      cabinetUnloadBackApprovalInfo,
+    } = shipmentObj;
     if (currNode.type === "preinstall") {
       this.isReview = preInstallBackInfo ? true : false;
       if (preInstallBackInfo && preInstallBackInfo.approvalStatus !== 1) {
@@ -41,9 +45,19 @@ export default {
       }
       this.bpmProcessId = preInstallBackInfo?.bpmProcessId;
     }
+    if (currNode.type === "cabinet") {
+      this.isReview = cabinetBackInfo ? true : false;
+      if (cabinetBackInfo && cabinetBackInfo.approvalStatus !== 1) {
+        this.isReview = false;
+      }
+      this.bpmProcessId = cabinetBackInfo?.bpmProcessId;
+    }
     if (currNode.type === "unloading") {
       this.isReview = cabinetUnloadBackApprovalInfo ? true : false;
-      if (cabinetUnloadBackApprovalInfo && cabinetUnloadBackApprovalInfo.approvalStatus !== 1) {
+      if (
+        cabinetUnloadBackApprovalInfo &&
+        cabinetUnloadBackApprovalInfo.approvalStatus !== 1
+      ) {
         this.isReview = false;
       }
       this.bpmProcessId = cabinetUnloadBackApprovalInfo?.bpmProcessId;
@@ -59,11 +73,15 @@ export default {
       this.$refs["reviewForm"].validate((valid) => {
         if (valid) {
           const { currNode, shipmentObj } = this.$attrs;
+          let approvalType = 4; // 预装反审
+          if (currNode.type === "cabinet") approvalType = 9; // 装柜反审
+          if (currNode.type === "unloading") approvalType = 7; // 卸柜反审核
+
           approvalCreate({
             shipmentId: shipmentObj.id,
             ...this.reviewObj,
             approvalStatus: 0,
-            approvalType: currNode.type === "preinstall" ? 4 : 7, // 4预装反审 7卸柜反审核
+            approvalType,
           }).then((res) => {
             serviceMsg(res, this).then(() => {
               this.cancel("submit");

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

@@ -80,12 +80,12 @@ export default {
     seaBaseData: Array,
     width: {
       type: String,
-      default: '76px'
+      default: "76px",
     },
     height: {
       type: String,
-      default: '76px'
-    }
+      default: "76px",
+    },
   },
   data() {
     return {
@@ -169,6 +169,16 @@ export default {
             this.$set(this.dialogConfig, "fullscreen", true);
             this.$set(this.dialogConfig, "title", this.$t("出货安排（预装）"));
           }
+        // 装柜
+        case "cabinet":
+          // 装柜反审
+          const cabStatus = this.shipmentObj[node.keyName];
+          if ([47].includes(cabStatus)) {
+            this.currentComponent = `reviewWidget`;
+            this.$set(this.dialogConfig, "width", "700px");
+            this.$set(this.dialogConfig, "title", this.$t("装柜反审"));
+          }
+          break;
         // 卸柜
         case "unloading":
           // 卸柜反审