From 37dae2a1f5be9f04a53965184c9257926f372d79 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 20 Sep 2024 18:21:43 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E6=B5=81=E7=A8=8B=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=90=8Ego(-1)=E4=B8=8D=E6=88=90=E5=8A=9F=E7=9A=84=E8=AF=9D?=
 =?UTF-8?q?=E5=B0=B1=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=B5=81=E7=A8=8B=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/WorkCenterMixin.js                 | 20 +++++++++++++++++++
 .../EnterpriseStandardChangeFlow.vue          |  3 ---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/mixins/WorkCenterMixin.js b/src/mixins/WorkCenterMixin.js
index 6b2896c6..52b86cb3 100644
--- a/src/mixins/WorkCenterMixin.js
+++ b/src/mixins/WorkCenterMixin.js
@@ -89,7 +89,18 @@ export const WorkCenterMixin = {
       let timer = setTimeout(() => {
         clearTimeout(timer)
         timer = null
+        Vue.prototype.$isNavigating = true // 设置为正在跳转
         this.$router.go(-1)
+        let timerTwo = setTimeout(() => {
+          clearTimeout(timerTwo)
+          timerTwo = null
+          if (Vue.prototype.$isNavigating) {
+            console.log('未成功完成跳转')
+            this.$router.replace('/workCenter/processCenter/processCenter')
+          } else {
+            console.log('成功完成跳转')
+          }
+        }, 100) // 设置合适的超时时间，确保在路由确实改变后执行
       }, 700)
     },
     switchChange (value) {
@@ -103,6 +114,9 @@ export const WorkCenterMixin = {
    * @param next
    */
   beforeRouteEnter (to, from, next) {
+    console.log('***********beforeRouteEnter')
+    // 设置一个标志，表示即将跳转
+    Vue.prototype.$isNavigating = true
     if (to.query.taskId) {
       queryTaskNameByTaskId({taskId: to.query.taskId}).then(res => {
         if (res.success) {
@@ -114,5 +128,11 @@ export const WorkCenterMixin = {
     } else {
       next()
     }
+  },
+  beforeRouteLeave (to, from, next) {
+    console.log('*********beforeRouteLeave')
+    // 跳转结束后，清除标志
+    Vue.prototype.$isNavigating = false
+    next()
   }
 }
diff --git a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue
index 6a71a5be..d2bc5c10 100644
--- a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue
+++ b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue
@@ -616,9 +616,6 @@ export default {
           }
         })
       })
-    },
-    goBack () {
-      this.$router.go(-1)
     }
   }
 }