From aef170f3747af544426db66af325f9ab83728350 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 20 Jan 2025 13:35:21 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E8=AE=BE=E8=AE=A1=E5=85=B3=E9=97=AD=E5=90=8E=20?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=9B=9E=E6=89=93=E5=BC=80=E7=9A=84=E5=9C=B0?=
 =?UTF-8?q?=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workflow/processDefinition/design.vue |  2 +-
 src/views/workflow/processDefinition/index.vue  | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/views/workflow/processDefinition/design.vue b/src/views/workflow/processDefinition/design.vue
index 3ec44f7..05e6538 100644
--- a/src/views/workflow/processDefinition/design.vue
+++ b/src/views/workflow/processDefinition/design.vue
@@ -29,7 +29,7 @@ const open = async (definitionId, disabled) => {
 };
 /** 关闭按钮 */
 function close() {
-  const obj = { path: '/workflow/processDefinition' };
+  const obj = { path: '/workflow/processDefinition', query: {activeName: proxy.$route.query.activeName}};
   proxy.$tab.closeOpenPage(obj);
 }
 
diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue
index cd40266..9888892 100644
--- a/src/views/workflow/processDefinition/index.vue
+++ b/src/views/workflow/processDefinition/index.vue
@@ -56,7 +56,7 @@
               <el-col :span="1.5">
                 <el-button type="warning" icon="Download" :disabled="single" @click="handleExportDef">导出</el-button>
               </el-col>
-              <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
+              <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
             </el-row>
           </template>
           <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
@@ -261,7 +261,7 @@ const form = ref<FlowDefinitionForm>({
   formPath: ''
 });
 onMounted(() => {
-  handleQuery();
+  getPageList();
   getTreeselect();
 });
 
@@ -324,6 +324,10 @@ const handleSelectionChange = (selection: any) => {
 };
 //分页
 const getPageList = async () => {
+  console.log(proxy.$route.query.activeName)
+  if (proxy.$route.query.activeName) {
+    activeName.value = proxy.$route.query.activeName;
+  }
   if (activeName.value === '0') {
     getList();
   } else {
@@ -430,7 +434,8 @@ const design = async (row: FlowDefinitionVo) => {
     path: `/workflow/design/index`,
     query: {
       definitionId: row.id,
-      disabled: false
+      disabled: false,
+      activeName: activeName.value
     }
   });
 };
@@ -444,7 +449,8 @@ const designView = async (row: FlowDefinitionVo) => {
     path: `/workflow/design/index`,
     query: {
       definitionId: row.id,
-      disabled: true
+      disabled: true,
+      activeName: activeName.value
     }
   });
 };