From 614cb0ce301f7dfffb89f771723b4779d8caa8b1 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 10 十二月 2024 16:37:49 +0800
Subject: [PATCH] 流程推进页面返回页面

---
 src/views/flowable/task/myProcess/send/index.vue   |   10 ++++++----
 src/views/flowable/task/myProcess/detail/index.vue |   10 ++++++----
 src/views/projectProcess/detail/index.vue          |    6 ++++--
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/views/flowable/task/myProcess/detail/index.vue b/src/views/flowable/task/myProcess/detail/index.vue
index 2d186fb..c797cb2 100644
--- a/src/views/flowable/task/myProcess/detail/index.vue
+++ b/src/views/flowable/task/myProcess/detail/index.vue
@@ -95,6 +95,7 @@
       // 閬僵灞�
       loading: true,
       flowRecordList: [], // 娴佺▼娴佽浆鏁版嵁
+      goBackParams: {},
       taskForm:{
         multiple: false,
         comment:"", // 鎰忚鍐呭
@@ -110,6 +111,7 @@
     this.taskForm.deployId = this.$route.query && this.$route.query.deployId;
     this.taskForm.taskId  = this.$route.query && this.$route.query.taskId;
     this.taskForm.procInsId = this.$route.query && this.$route.query.procInsId;
+    this.goBackParams = this.$route.query && this.$route.query.goBackParams;
     // 娴佺▼浠诲姟閲嶈幏鍙栧彉閲忚〃鍗�
     this.processVariables( this.taskForm.taskId)
     this.getFlowRecordList(this.taskForm.procInsId, this.taskForm.deployId);
@@ -187,10 +189,10 @@
     },
     /** 杩斿洖椤甸潰 */
     goBack() {
-      // // 鍏抽棴褰撳墠鏍囩椤靛苟杩斿洖涓婁釜椤甸潰
-      // const obj = { path: "/task/process", query: { t: Date.now()} };
-      // this.$tab.closeOpenPage(obj);
-      this.$tab.closePage()
+      this.$router.push({
+        path: '/projectFlow/detail',
+        query: this.goBackParams
+      })
     },
   }
 };
diff --git a/src/views/flowable/task/myProcess/send/index.vue b/src/views/flowable/task/myProcess/send/index.vue
index ce36f2e..b235359 100644
--- a/src/views/flowable/task/myProcess/send/index.vue
+++ b/src/views/flowable/task/myProcess/send/index.vue
@@ -65,6 +65,7 @@
   props: {},
   data() {
     return {
+      goBackParams: {},
       formDataList: [],  // 琛ㄥ崟鍒楄〃
       taskId: '',
       processName: '',
@@ -99,6 +100,7 @@
     this.taskId = this.$route.query && this.$route.query.taskId;
     // 鍒濆鍖栬〃鍗�
     this.procDefId  = this.$route.query && this.$route.query.procDefId;
+    this.goBackParams  = this.$route.query && this.$route.query.goBackParams;
     // this.getNextFlowNodeByStart(this.deployId);
     this.getFlowFormData(this.taskId);
   },
@@ -155,10 +157,10 @@
     },
     /** 杩斿洖椤甸潰 */
     goBack() {
-      // // 鍏抽棴褰撳墠鏍囩椤靛苟杩斿洖涓婁釜椤甸潰
-      // const obj = { path: "/task/process", query: { t: Date.now()} };
-      // this.$tab.closeOpenPage(obj);
-      this.$tab.closePage()
+      this.$router.push({
+        path: '/projectFlow/detail',
+        query: this.goBackParams
+      })
     },
     /** 鐢宠娴佺▼琛ㄥ崟鏁版嵁鎻愪氦 */
     submitForm() {
diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index c21ec20..37167c0 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -167,7 +167,8 @@
             procDefId: row.processDefId,
             processName: row.taskName,
             taskId: row.taskId,
-            showAuditing: res.data
+            showAuditing: res.data,
+            goBackParams: this.queryParams
           }
         })
       })
@@ -177,7 +178,8 @@
         query: {
           procInsId: row.processInsId,
           deployId: row.deployId,
-          taskId: row.taskId
+          taskId: row.taskId,
+          goBackParams: this.queryParams
         }})
     },
     search() {

--
Gitblit v1.8.0