Skip to content

Commit c276852

Browse files
committed
code review:修复工作流的审批界面报错问题
1 parent 0242c84 commit c276852

File tree

2 files changed

+29
-32
lines changed

2 files changed

+29
-32
lines changed

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

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
<template>
22
<el-drawer v-model="drawerVisible" title="子任务" size="70%">
3+
<!-- 当前任务 -->
34
<template #header>
45
<h4>【{{ baseTask.name }} 】审批人:{{ baseTask.assigneeUser?.nickname }}</h4>
5-
<el-button style="margin-left: 5px" v-if="showSubSignButton(baseTask)" type="danger" plain @click="handleSubSign(baseTask)">
6-
<Icon icon="ep:remove" />
7-
减签
6+
<el-button
7+
style="margin-left: 5px"
8+
v-if="isSubSignButtonVisible(baseTask)"
9+
type="danger"
10+
plain
11+
@click="handleSubSign(baseTask)"
12+
>
13+
<Icon icon="ep:remove" /> 减签
814
</el-button>
915
</template>
10-
<el-table :data="tableData" style="width: 100%" row-key="id" border>
16+
<!-- 子任务列表 -->
17+
<el-table :data="baseTask.children" style="width: 100%" row-key="id" border>
1118
<el-table-column prop="assigneeUser.nickname" label="审批人" />
1219
<el-table-column prop="assigneeUser.deptName" label="所在部门" />
1320
<el-table-column label="审批状态" prop="result">
@@ -32,18 +39,17 @@
3239
<el-table-column label="操作" prop="operation">
3340
<template #default="scope">
3441
<el-button
35-
v-if="showSubSignButton(scope.row)"
42+
v-if="isSubSignButtonVisible(scope.row)"
3643
type="danger"
3744
plain
3845
@click="handleSubSign(scope.row)"
3946
>
40-
<Icon icon="ep:remove" />
41-
减签
47+
<Icon icon="ep:remove" /> 减签
4248
</el-button>
4349
</template>
4450
</el-table-column>
4551
</el-table>
46-
<!-- 减签 -->
52+
<!-- 减签 -->
4753
<TaskSubSignDialogForm ref="taskSubSignDialogForm" />
4854
</el-drawer>
4955
</template>
@@ -53,12 +59,11 @@ import { DICT_TYPE } from '@/utils/dict'
5359
import { dateFormatter } from '@/utils/formatTime'
5460
import TaskSubSignDialogForm from './TaskSubSignDialogForm.vue'
5561
56-
const message = useMessage() // 消息弹窗
57-
defineOptions({ name: 'ProcessInstancechildrenList' })
62+
defineOptions({ name: 'ProcessInstanceChildrenTaskList' })
5863
64+
const message = useMessage() // 消息弹窗
5965
const drawerVisible = ref(false) // 抽屉的是否展示
6066
61-
const tableData = ref<any[]>([]) //表格数据
6267
const baseTask = ref<object>({})
6368
/** 打开弹窗 */
6469
const open = async (task: any) => {
@@ -67,30 +72,22 @@ const open = async (task: any) => {
6772
return
6873
}
6974
baseTask.value = task
70-
//设置表格数据
71-
tableData.value = task.children
72-
//展开抽屉
75+
// 展开抽屉
7376
drawerVisible.value = true
7477
}
7578
defineExpose({ open }) // 提供 openModal 方法,用于打开弹窗
7679
77-
const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调
78-
79-
/**
80-
* 减签
81-
*/
80+
/** 发起减签 */
8281
const taskSubSignDialogForm = ref()
8382
const handleSubSign = (item) => {
8483
taskSubSignDialogForm.value.open(item.id)
84+
// TODO @海洋:减签后,需要刷新下界面哈
8585
}
8686
87-
/**
88-
* 显示减签按钮
89-
* @param task
90-
*/
91-
const showSubSignButton = (task:any) => {
92-
if(!isEmpty(task.children)){
93-
//有子任务,且子任务有任意一个是 待处理 和 待前置任务完成 则显示减签按钮
87+
/** 是否显示减签按钮 */
88+
const isSubSignButtonVisible = (task: any) => {
89+
if (task && task.children && !isEmpty(task.children)) {
90+
// 有子任务,且子任务有任意一个是 待处理 和 待前置任务完成 则显示减签按钮
9491
const subTask = task.children.find((item) => item.result === 1 || item.result === 9)
9592
return !isEmpty(subTask)
9693
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
</el-form-item>
2323
</el-form>
2424
<template #footer>
25-
<el-button :disabled="formLoading" type="primary" @click="submitForm('before')"
26-
>向前加签</el-button
27-
>
28-
<el-button :disabled="formLoading" type="primary" @click="submitForm('after')"
29-
>向后加签</el-button
30-
>
25+
<el-button :disabled="formLoading" type="primary" @click="submitForm('before')">
26+
向前加签
27+
</el-button>
28+
<el-button :disabled="formLoading" type="primary" @click="submitForm('after')">
29+
向后加签
30+
</el-button>
3131
<el-button @click="dialogVisible = false">取 消</el-button>
3232
</template>
3333
</Dialog>

0 commit comments

Comments
 (0)