From de411af0c3e5a760e38782c1a932836fa9bff7d9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 03 三月 2025 15:00:59 +0800
Subject: [PATCH] 路由调整

---
 src/views/business/materialOrder/customsInspection.vue |   36 ++++++++++++++++++++++++------------
 1 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 0f6f2c4..b8c03af 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -388,7 +388,7 @@
       width="32%">
       <span>{{ dialogMessage }}</span>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="goBack()">纭� 瀹�</el-button>
+        <el-button type="primary" @click="dialogVisible= false,closeOpenPage()">纭� 瀹�</el-button>
       </span>
     </el-dialog>
     <el-dialog
@@ -451,10 +451,6 @@
   dicts: ['check_type', 'urgency_level'],
   components: {},
   props: {
-    isReport: {
-      type: Number,
-      default: () => null
-    }
   },
   data() {
     return {
@@ -462,6 +458,7 @@
       orderType: '',
       active: 0,
       currentId: 0,
+      isReport: '',
       editTable:[], // 鍖洪棿鐗规畩鍊煎~鍐�
       template: null,
       saveLoad: false, // 淇濆瓨鎸夐挳loading
@@ -636,11 +633,19 @@
       this.standardMethodListId = null
     }
   },
-  mounted() {
+  created() {
     this.active = this.$route.query.active
     this.orderType = this.$route.query.orderType
     this.currentId = this.$route.query.currentId
+    this.isReport = this.$route.query.isReport
     this.customsInspection = this.$route.query.customsInspection
+  },
+  activated() {
+    if (this.active==1) {
+      this.getInfo();
+    }
+  },
+  getInfo() {
     this.getUserNowList() // 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
     this.selectStandardMethods() // 鑾峰彇妫�楠屾爣鍑嗕笅鎷夋鏁版嵁
     this.getInfo() // 鑾峰彇鏁版嵁
@@ -698,7 +703,7 @@
           orderId = this.dataIndex === 0 ? this.customsInspection.enterOrderId : this.customsInspection.quarterOrderId
         } else if (!this.customsInspection.enterOrderId && !this.customsInspection.quarterOrderId) {
           this.isShowTab = false
-          orderId = this.isReport === 1 ? this.customsInspection.insOrderId : this.customsInspection.id
+          orderId = this.isReport == 1 ? this.customsInspection.insOrderId : this.customsInspection.id
         }
         // 鏌ョ湅
         // 璇锋眰鎺ュ彛锛屽洖鏄炬暟鎹�
@@ -1019,7 +1024,7 @@
         if (res.code == 201) return
         this.noNeedCheckDia = false
         this.$message.success('宸叉彁浜�')
-        this.goBack()
+        this.closeOpenPage()
       }).catch(e=>{
         this.noNeedCheckLoad = false
       })
@@ -1071,7 +1076,7 @@
         if (res.code == 201) return
         this.$message.success('宸叉彁浜�')
         this.bsm3Dia = false;
-        this.goBack()
+        this.closeOpenPage()
       }).catch(e=>{
         this.saveLoad = false
       })
@@ -1834,9 +1839,16 @@
       return row[property] === value;
     },
     goBack () {
-      const obj = { path: "/business/materialOrder" };
-      this.$tab.closeOpenPage(obj);
-    }
+      if (this.active == 1) {
+        this.$router.go(-1)
+      } else {
+        this.closeOpenPage()
+      }
+    },
+    closeOpenPage() {
+      this.$router.go(-1)
+      this.$tab.closeOpenPage()
+    },
   }
 }
 </script>

--
Gitblit v1.9.3