From 61df97c4b9e40a8c5cc12fe7ed484d4354cca49a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 06 六月 2024 10:59:20 +0800
Subject: [PATCH] update 优化 标识符错误

---
 src/views/workflow/task/myDocument.vue |   52 +++++++++++++++++++---------------------------------
 1 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue
index 01e0a30..1bf5bbf 100644
--- a/src/views/workflow/task/myDocument.vue
+++ b/src/views/workflow/task/myDocument.vue
@@ -46,9 +46,9 @@
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column align="center" type="index" label="搴忓彿" width="60"></el-table-column>
             <el-table-column v-if="false" align="center" prop="id" label="id"></el-table-column>
-            <el-table-column :show-overflow-tooltip="true"  align="center" label="娴佺▼瀹氫箟鍚嶇О">
+            <el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О">
               <template #default="scope">
-                  <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
+                <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>
@@ -64,39 +64,31 @@
             <el-table-column align="center" label="娴佺▼鐘舵��" min-width="70">
               <template #default="scope">
                 <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag>
-            </template>
+              </template>
             </el-table-column>
             <el-table-column align="center" prop="startTime" label="鍚姩鏃堕棿" width="160"></el-table-column>
             <el-table-column v-if="tab === 'finish'" align="center" prop="endTime" label="缁撴潫鏃堕棿" width="160"></el-table-column>
             <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
               <template #default="scope">
                 <el-tooltip
-                  v-if="
-                    scope.row.businessStatus === 'draft' ||
-                    scope.row.businessStatus === 'cancel' ||
-                    scope.row.businessStatus === 'back'
-                  "
+                  v-if="scope.row.businessStatus === 'draft' || scope.row.businessStatus === 'cancel' || scope.row.businessStatus === 'back'"
                   content="淇敼"
                   placement="top"
                 >
-                  <el-button v-hasPermi="['demo:leave:edit']" link type="primary" icon="Edit" @click="handleOpen(scope.row,'update')"></el-button>
+                  <el-button link type="primary" icon="Edit" @click="handleOpen(scope.row, 'update')"></el-button>
                 </el-tooltip>
                 <el-tooltip
-                  v-if="
-                    scope.row.businessStatus === 'draft' ||
-                    scope.row.businessStatus === 'cancel' ||
-                    scope.row.businessStatus === 'back'
-                  "
+                  v-if="scope.row.businessStatus === 'draft' || scope.row.businessStatus === 'cancel' || scope.row.businessStatus === 'back'"
                   content="鍒犻櫎"
                   placement="top"
                 >
-                  <el-button v-hasPermi="['demo:leave:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+                  <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
                 </el-tooltip>
-                <el-tooltip placement="top" content="鏌ョ湅" >
-                  <el-button link type="primary" icon="View" @click="handleOpen(scope.row,'view')"></el-button>
+                <el-tooltip placement="top" content="鏌ョ湅">
+                  <el-button link type="primary" icon="View" @click="handleOpen(scope.row, 'view')"></el-button>
                 </el-tooltip>
                 <el-tooltip v-if="scope.row.businessStatus === 'waiting'" content="鎾ら攢" placement="top">
-                  <el-button link type="primary" icon="Notification" @click="handleCancelProcessApply(scope.row.id)"></el-button>
+                  <el-button link type="primary" icon="Notification" @click="handleCancelProcessApply(scope.row.businessKey)"></el-button>
                 </el-tooltip>
               </template>
             </el-table-column>
@@ -131,7 +123,7 @@
 // 閬僵灞�
 const loading = ref(true);
 // 閫変腑鏁扮粍
-const ids = ref<Array<any>>([]);
+const businessKeys = ref<Array<any>>([]);
 // 闈炲崟涓鐢�
 const single = ref(true);
 // 闈炲涓鐢�
@@ -198,12 +190,6 @@
   categoryOptions.value.push(data);
 };
 
-//瀹℃壒璁板綍
-const handleApprovalRecord = (processInstanceId: string) => {
-  if (approvalRecordRef.value) {
-    approvalRecordRef.value.init(processInstanceId);
-  }
-};
 /** 鎼滅储鎸夐挳鎿嶄綔 */
 const handleQuery = () => {
   getList();
@@ -218,7 +204,7 @@
 };
 // 澶氶�夋閫変腑鏁版嵁
 const handleSelectionChange = (selection: ProcessInstanceVO[]) => {
-  ids.value = selection.map((item: any) => item.id);
+  businessKeys.value = selection.map((item: any) => item.businessKey);
   single.value = selection.length !== 1;
   multiple.value = !selection.length;
 };
@@ -234,29 +220,29 @@
 
 /** 鍒犻櫎鎸夐挳鎿嶄綔 */
 const handleDelete = async (row: ProcessInstanceVO) => {
-  const id = row.id || ids.value;
-  await proxy?.$modal.confirm('鏄惁纭鍒犻櫎id涓恒��' + id + '銆戠殑鏁版嵁椤癸紵');
+  const businessKey = row.businessKey || businessKeys.value;
+  await proxy?.$modal.confirm('鏄惁纭鍒犻櫎涓氬姟id涓恒��' + businessKey + '銆戠殑鏁版嵁椤癸紵');
   loading.value = true;
   if ('running' === tab.value) {
-    await deleteRunAndHisInstance(id).finally(() => (loading.value = false));
+    await deleteRunAndHisInstance(businessKey).finally(() => (loading.value = false));
     getList();
   }
   proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
 };
 
 /** 鎾ら攢鎸夐挳鎿嶄綔 */
-const handleCancelProcessApply = async (processInstanceId: string) => {
+const handleCancelProcessApply = async (businessKey: string) => {
   await proxy?.$modal.confirm('鏄惁纭鎾ら攢褰撳墠鍗曟嵁锛�');
   loading.value = true;
   if ('running' === tab.value) {
-    await cancelProcessApply(processInstanceId).finally(() => (loading.value = false));
+    await cancelProcessApply(businessKey).finally(() => (loading.value = false));
     getList();
   }
   proxy?.$modal.msgSuccess('鎾ら攢鎴愬姛');
 };
 
 //鍔炵悊
-const handleOpen = async (row,type) => {
+const handleOpen = async (row, type) => {
   const routerJumpVo = reactive<RouterJumpVo>({
     wfDefinitionConfigVo: row.wfDefinitionConfigVo,
     wfNodeConfigVo: row.wfNodeConfigVo,
@@ -264,6 +250,6 @@
     taskId: row.id,
     type: type
   });
-  workflowCommon.routerJump(routerJumpVo,proxy)
+  workflowCommon.routerJump(routerJumpVo, proxy);
 };
 </script>

--
Gitblit v1.9.3