From 40a75dae3182cb55b30a2e8093c5eed82465f59c Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: 星期一, 15 四月 2024 10:40:33 +0800
Subject: [PATCH] fix 修复代码缩进.

---
 src/views/workflow/task/taskCopyList.vue |   48 +++++++++++++++++++++++++-----------------------
 1 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/views/workflow/task/taskCopyList.vue b/src/views/workflow/task/taskCopyList.vue
index 54e8f1e..1452576 100644
--- a/src/views/workflow/task/taskCopyList.vue
+++ b/src/views/workflow/task/taskCopyList.vue
@@ -30,11 +30,15 @@
 
       <el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column fixed align="center" type="index" label="搴忓彿" width="60"></el-table-column>
-        <el-table-column fixed align="center" prop="processDefinitionName" label="娴佺▼瀹氫箟鍚嶇О"></el-table-column>
-        <el-table-column fixed align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column>
-        <el-table-column fixed align="center" prop="name" label="浠诲姟鍚嶇О"></el-table-column>
-        <el-table-column fixed align="center" prop="assigneeName" label="鍔炵悊浜�">
+        <el-table-column align="center" type="index" label="搴忓彿" width="60"></el-table-column>
+        <el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О">
+          <template #default="scope">
+            <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column>
+        <el-table-column align="center" prop="name" label="浠诲姟鍚嶇О"></el-table-column>
+        <el-table-column align="center" prop="assigneeName" label="鍔炵悊浜�">
           <template #default="scope">
             <template v-if="scope.row.participantVo && scope.row.assignee === null">
               <el-tag v-for="(item, index) in scope.row.participantVo.candidateName" :key="index" type="success">
@@ -43,19 +47,19 @@
             </template>
             <template v-else>
               <el-tag type="success">
-                {{ scope.row.assigneeName }}
+                {{ scope.row.assigneeName || '鏃�' }}
               </el-tag>
             </template>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="businessStatusName" label="娴佺▼鐘舵��" min-width="70">
+        <el-table-column align="center" label="娴佺▼鐘舵��" min-width="70">
           <template #default="scope">
-            <el-tag type="success">{{ scope.row.businessStatusName }}</el-tag>
+            <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag>
           </template>
         </el-table-column>
         <el-table-column label="鎿嶄綔" align="center" width="200">
           <template #default="scope">
-              <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">鏌ョ湅</el-button>
+            <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">鏌ョ湅</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -71,11 +75,14 @@
 </template>
 
 <script lang="ts" setup>
-import { getPageByTaskCopy} from '@/api/workflow/task';
+import { getPageByTaskCopy } from '@/api/workflow/task';
 import { TaskQuery } 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;
+const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
 // 閬僵灞�
 const loading = ref(true);
 // 閫変腑鏁扮粍
@@ -127,20 +134,15 @@
 
 /** 鏌ョ湅鎸夐挳鎿嶄綔 */
 const handleView = (row) => {
-  if(row.wfFormDefinitionVo){
-    proxy.$tab.closePage(proxy.$route);
-    proxy.$router.push({
-      path: `${row.wfFormDefinitionVo.path}`,
-      query: {
-        id: row.businessKey,
-        type: 'view'
-      }
-    })
-  }else{
-    proxy?.$modal.msgError('璇峰埌娴佺▼瀹氫箟鑿滃崟閰嶇疆璺敱锛�');
-  }
+  const routerJumpVo = reactive<RouterJumpVo>({
+    wfDefinitionConfigVo: row.wfDefinitionConfigVo,
+    wfNodeConfigVo: row.wfNodeConfigVo,
+    businessKey: row.businessKey,
+    taskId: row.id,
+    type: 'view'
+  });
+  workflowCommon.routerJump(routerJumpVo, proxy);
 };
-
 
 onMounted(() => {
   getTaskCopyList();

--
Gitblit v1.9.3