From 13a33b2506a55fe1425d94fe931a80d64d226727 Mon Sep 17 00:00:00 2001
From: "825299534@qq.com" <Aa825299534>
Date: Mon, 28 Apr 2025 08:46:43 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=89=B9=E4=BA=BA?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=E9=85=8D=E7=BD=AE2.?=
 =?UTF-8?q?=E8=8D=89=E7=A8=BF=E7=AE=B1=E6=B7=BB=E5=8A=A0=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=92=8C=E4=BB=BB=E5=8A=A1=E5=90=8D=E5=92=8C?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/form/template/index.vue             | 53 ++++---------------
 .../task/components/processTasks/DraftsV2.vue | 15 +++++-
 2 files changed, 23 insertions(+), 45 deletions(-)

diff --git a/src/views/form/template/index.vue b/src/views/form/template/index.vue
index cde5c0a..b44a789 100644
--- a/src/views/form/template/index.vue
+++ b/src/views/form/template/index.vue
@@ -8,7 +8,6 @@
         :clickRowToExpand="true"
         :treeData="treeData"
         :fieldNames="fieldNames"
-        @row-dbClick="dbClickRow"
         :row-selection="rowSelection"
       >
         <template #title="item">
@@ -202,6 +201,7 @@
   import { InputParamItem } from '/@/components/ApiConfig/src/interface';
   import { getDraftInfo } from '/@/api/workflow/process';
   import FlowRecord from '/@/views/workflow/task/components/flow/FlowRecord.vue';
+  import {de} from "@fullcalendar/core/internal-common";
   interface SearchDate {
     fieldName: string;
     format: string;
@@ -579,15 +579,6 @@
 
   function handleView(record: Recordable) {
       if (record.workflowData?.taskIds && record.workflowData.taskIds.length) {
-          const { processId, taskIds, schemaId } = record.workflowData;
-          router.push({
-              path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
-              query: {
-                  taskId: taskIds[0],
-                  rtId: currentRoute.value.query.rtId
-              }
-          });
-      } else if (record.workflowData?.schemaId && !record.workflowData.taskIds) {
           const { processId, schemaId } = record.workflowData;
           router.push({
               path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
@@ -758,6 +749,7 @@
     }
   }
   async function handleLaunchProcess(record: Recordable) {
+      debugger
     if (record.workflowData) {
       if (record.workflowData.draftId) {
         let res = await getDraftInfo(record.workflowData.draftId);
@@ -783,10 +775,14 @@
     }
   }
   function handleApproveProcess(record: Recordable) {
-    visibleApproveProcessRef.value = true;
-    schemaIdRef.value = record.workflowData.schemaId;
-    processIdRef.value = record.workflowData.processId;
-    taskIdRef.value = record.workflowData.taskIds[0];
+      const { processId, taskIds, schemaId } = record.workflowData;
+      router.push({
+          path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
+          query: {
+              taskId: taskIds[0],
+              rtId: currentRoute.value.query.rtId
+          }
+      });
   }
   function handleCloseLaunch() {
     visibleLaunchProcessRef.value = false;
@@ -948,35 +944,6 @@
           }
       });
   }
-  function dbClickRow(record) {
-      if (record.workflowData?.taskIds && record.workflowData.taskIds.length) {
-          const { processId, taskIds, schemaId } = record.workflowData;
-          router.push({
-              path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
-              query: {
-                  taskId: taskIds[0],
-                  rtId: currentRoute.value.query.rtId
-              }
-          });
-      } else if (record.workflowData?.schemaId && !record.workflowData.taskIds) {
-          const { processId, schemaId } = record.workflowData;
-          router.push({
-              path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
-              query: {
-                  readonly: 1,
-                  taskId: '',
-                  rtId: currentRoute.value.query.rtId
-              }
-          });
-      } else {
-          router.push({
-              path: '/form/infoTaskManageItem/' + record.id + '/viewForm',
-              query: {
-                  formPath: 'infoManage/infoTaskManageItem'
-              }
-          });
-      }
-  }
 
   const rowSelection: TableProps['rowSelection'] = {
       onChange: (selectedRowKeys: string[], selectedRows: DataType[]) => {
diff --git a/src/views/workflow/task/components/processTasks/DraftsV2.vue b/src/views/workflow/task/components/processTasks/DraftsV2.vue
index e7c8ab0..a882f82 100644
--- a/src/views/workflow/task/components/processTasks/DraftsV2.vue
+++ b/src/views/workflow/task/components/processTasks/DraftsV2.vue
@@ -27,16 +27,27 @@ const { t } = useI18n();
 const router = useRouter();
 const configColumns = [
     {
-        title: t('流程名称'),
+        title: t('流程定义名称'),
         dataIndex: 'schemaName',
         align: 'left'
     },
     {
-        title: t('发起者'),
+        title: t('任务名称'),
+        dataIndex: 'taskName',
+        align: 'left',
+    },
+    {
+        title: t('流程发起者'),
         dataIndex: 'originator',
         sorter: true,
         align: 'left'
     },
+    {
+        title: t('创建人'),
+        dataIndex: 'createUserName',
+        sorter: true,
+        align: 'left',
+    },
     {
         title: t('发起时间'),
         dataIndex: 'createDate',