From c467d95703be720f303cb92ca7eca394469f23fd Mon Sep 17 00:00:00 2001
From: songgaoshuai <1742057357@qq.com>
Date: 星期二, 04 六月 2024 11:26:38 +0800
Subject: [PATCH] https://gitee.com/dromara/RuoYi-Cloud-Plus/issues/I9US1Q fix修复我的单据撤销，删除参数错误
---
src/views/workflow/task/myDocument.vue | 81 +++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 46 deletions(-)
diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue
index 9328934..2dec097 100644
--- a/src/views/workflow/task/myDocument.vue
+++ b/src/views/workflow/task/myDocument.vue
@@ -44,10 +44,14 @@
<el-table v-loading="loading" border :data="processInstanceList" @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 v-if="false" fixed align="center" prop="id" label="id"></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 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="娴佺▼瀹氫箟鍚嶇О">
+ <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="processDefinitionVersion" label="鐗堟湰鍙�" width="90">
<template #default="scope"> v{{ scope.row.processDefinitionVersion }}.0</template>
</el-table-column>
@@ -57,9 +61,9 @@
<el-tag v-else type="danger">鎸傝捣</el-tag>
</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 align="center" prop="startTime" label="鍚姩鏃堕棿" width="160"></el-table-column>
@@ -67,32 +71,24 @@
<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 v-hasPermi="['demo:leave:edit']" 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-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>
@@ -117,14 +113,17 @@
import { listCategory } from '@/api/workflow/category';
import { CategoryVO } from '@/api/workflow/category/types';
import { ProcessInstanceQuery, ProcessInstanceVO } from '@/api/workflow/processInstance/types';
+import workflowCommon from '@/api/workflow/workflowCommon';
+import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
const queryFormRef = ref<ElFormInstance>();
const categoryTreeRef = ref<ElTreeInstance>();
// 閬僵灞�
const loading = ref(true);
// 閫変腑鏁扮粍
-const ids = ref<Array<any>>([]);
+const businessKeys = ref<Array<any>>([]);
// 闈炲崟涓鐢�
const single = ref(true);
// 闈炲涓鐢�
@@ -191,12 +190,6 @@
categoryOptions.value.push(data);
};
-//瀹℃壒璁板綍
-const handleApprovalRecord = (processInstanceId: string) => {
- if (approvalRecordRef.value) {
- approvalRecordRef.value.init(processInstanceId);
- }
-};
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
getList();
@@ -211,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;
};
@@ -227,40 +220,36 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
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) => {
- if(row.wfFormDefinitionVo){
- proxy.$tab.closePage(proxy.$route);
- proxy.$router.push({
- path: `${row.wfFormDefinitionVo.path}`,
- query: {
- id: row.businessKey,
- type: type
- }
- })
- }else{
- proxy?.$modal.msgError('璇峰埌娴佺▼瀹氫箟鑿滃崟閰嶇疆璺敱锛�');
- }
+const handleOpen = async (row, type) => {
+ const routerJumpVo = reactive<RouterJumpVo>({
+ wfDefinitionConfigVo: row.wfDefinitionConfigVo,
+ wfNodeConfigVo: row.wfNodeConfigVo,
+ businessKey: row.businessKey,
+ taskId: row.id,
+ type: type
+ });
+ workflowCommon.routerJump(routerJumpVo, proxy);
};
</script>
--
Gitblit v1.9.3