From 2ea1807f34479f683f4fc3691dfccf4146b94706 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期日, 31 三月 2024 15:34:54 +0800
Subject: [PATCH] add 添加表单配置

---
 src/views/workflow/task/taskWaiting.vue |   36 ++++++++++++------------------------
 1 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue
index 29a52a2..af609cb 100644
--- a/src/views/workflow/task/taskWaiting.vue
+++ b/src/views/workflow/task/taskWaiting.vue
@@ -43,7 +43,7 @@
             </template>
             <template v-else>
               <el-tag type="success">
-                {{ scope.row.assigneeName }}
+                {{ scope.row.assigneeName || '鏃�' }}
               </el-tag>
             </template>
           </template>
@@ -79,6 +79,9 @@
 <script lang="ts" setup>
 import { getPageByTaskWait, claim, returnTask } from '@/api/workflow/task';
 import { TaskQuery, TaskVO } from '@/api/workflow/task/types';
+import workflowCommon from '@/api/workflow/workflowCommon';
+import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
+
 //鎻愪氦缁勪欢
 const queryFormRef = ref<ElFormInstance>();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -135,29 +138,14 @@
 };
 //鍔炵悊
 const handleOpen = async (row: TaskVO) => {
-  if (row.formKey != null) {
-    proxy.$tab.closePage(proxy.$route);
-    proxy.$router.push({
-      path: `${row.formKey}`,
-      query: {
-        id: row.businessKey,
-        type: 'approval',
-        taskId: row.id
-      }
-    });
-  } else if (row.wfFormDefinitionVo) {
-    proxy.$tab.closePage(proxy.$route);
-    proxy.$router.push({
-      path: `${row.wfFormDefinitionVo.path}`,
-      query: {
-        id: row.businessKey,
-        type: 'approval',
-        taskId: row.id
-      }
-    });
-  } else {
-    proxy?.$modal.msgError('璇峰埌娴佺▼瀹氫箟鑿滃崟閰嶇疆璺敱锛�');
-  }
+  const routerJumpVo = reactive<RouterJumpVo>({
+    wfDefinitionConfigVo: row.wfDefinitionConfigVo,
+    wfNodeConfigVo: row.wfNodeConfigVo,
+    businessKey: row.businessKey,
+    taskId: row.id,
+    type: 'approval'
+  });
+  workflowCommon.routerJump(routerJumpVo,proxy)
 };
 
 /** 璁ら浠诲姟 */

--
Gitblit v1.9.3