Skip to content

Commit 62a9538

Browse files
author
youkehai
committed
fix: 减签按钮显示和api地址修改
1 parent 683e319 commit 62a9538

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

src/api/bpm/task/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ export const taskAddSign = async (data) => {
6969
/**
7070
* 获取减签任务列表
7171
*/
72-
export const getSubSignTaskList = async (id: string) => {
73-
return await request.get({ url: '/bpm/task/get-sub-sign?taskId=' + id })
72+
export const getChildrenTaskList = async (id: string) => {
73+
return await request.get({ url: '/bpm/task/get-children-task-list?taskId=' + id })
7474
}
7575

7676
/**

src/views/bpm/processInstance/detail/ProcessInstanceChildrenTaskList.vue

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<el-drawer v-model="drawerVisible" title="子任务" size="70%">
33
<template #header>
44
<h4>【{{ baseTask.name }} 】审批人:{{ baseTask.assigneeUser?.nickname }}</h4>
5-
<el-button style="margin-left: 5px" type="danger" plain @click="handleSubSign(baseTask)">
5+
<el-button style="margin-left: 5px" v-if="showSubSignButton(baseTask)" type="danger" plain @click="handleSubSign(baseTask)">
66
<Icon icon="ep:remove" />
77
减签
88
</el-button>
@@ -32,7 +32,7 @@
3232
<el-table-column label="操作" prop="operation">
3333
<template #default="scope">
3434
<el-button
35-
v-if="!isEmpty(scope.row.children)"
35+
v-if="showSubSignButton(scope.row)"
3636
type="danger"
3737
plain
3838
@click="handleSubSign(scope.row)"
@@ -83,4 +83,17 @@ const taskSubSignDialogForm = ref()
8383
const handleSubSign = (item) => {
8484
taskSubSignDialogForm.value.open(item.id)
8585
}
86+
87+
/**
88+
* 显示减签按钮
89+
* @param task
90+
*/
91+
const showSubSignButton = (task:any) => {
92+
if(!isEmpty(task.children)){
93+
//有子任务,且子任务有任意一个是 待处理 和 待前置任务完成 则显示减签按钮
94+
const subTask = task.children.find((item) => item.result === 1 || item.result === 9)
95+
return !isEmpty(subTask)
96+
}
97+
return false
98+
}
8699
</script>

src/views/bpm/processInstance/detail/TaskSubSignDialogForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const formRef = ref() // 表单 Ref
4444
const subTaskList = ref([])
4545
/** 打开弹窗 */
4646
const open = async (id: string) => {
47-
subTaskList.value = await TaskApi.getSubSignTaskList(id)
47+
subTaskList.value = await TaskApi.getChildrenTaskList(id)
4848
if (isEmpty(subTaskList.value)) {
4949
message.warning('当前没有可减签的任务')
5050
return false

0 commit comments

Comments
 (0)