Skip to content

Commit de29528

Browse files
YunaiVYunaiV
committed
BPM：简化 task 接口的 VO，做一些合并。虽然字段上有冗余，但是读代码难度降低
1 parent 59c7c49 commit de29528

File tree

9 files changed

+69
-67
lines changed

9 files changed

+69
-67
lines changed

‎src/api/bpm/task/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ export const exportTask = async (params) => {
4343
}
4444

4545
// 获取所有可回退的节点
46-
export const getReturnList = async (params) => {
47-
return await request.get({ url: '/bpm/task/return-list', params })
46+
export const getTaskListByReturn = async (id: string) => {
47+
return await request.get({ url: '/bpm/task/list-by-return', params: { id } })
4848
}
4949

5050
// 回退
51-
export const returnTask = async (data) => {
51+
export const returnTask = async (data: any) => {
5252
return await request.put({ url: '/bpm/task/return', data })
5353
}
5454

@@ -70,7 +70,7 @@ export const taskAddSign = async (data) => {
7070
* 获取减签任务列表
7171
*/
7272
export const getChildrenTaskList = async (id: string) => {
73-
return await request.get({ url: '/bpm/task/children-list?taskId=' + id })
73+
return await request.get({ url: '/bpm/task/children-list?parentId=' + id })
7474
}
7575

7676
/**

‎src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,13 @@ const highlightDiagram = async () => {
121121
return
122122
}
123123
// 高亮任务
124-
canvas.addMarker(n.id, getResultCss(task.result))
124+
canvas.addMarker(n.id, getResultCss(task.status))
125125
//标记是否高亮了进行中任务
126-
if (task.result === 1) {
126+
if (task.status === 1) {
127127
findProcessTask = true
128128
}
129129
// 如果非通过，就不走后面的线条了
130-
if (task.result !== 2) {
130+
if (task.status !== 2) {
131131
return
132132
}
133133
// 处理 outgoing 出线
@@ -205,10 +205,10 @@ const highlightDiagram = async () => {
205205
})
206206
} else if (n.$type === 'bpmn:EndEvent') {
207207
// 结束节点
208-
if (!processInstance.value || processInstance.value.result === 1) {
208+
if (!processInstance.value || processInstance.value.status === 1) {
209209
return
210210
}
211-
canvas.addMarker(n.id, getResultCss(processInstance.value.result))
211+
canvas.addMarker(n.id, getResultCss(processInstance.value.status))
212212
} else if (n.$type === 'bpmn:ServiceTask') {
213213
//服务任务
214214
if (activity.startTime > 0 && activity.endTime === 0) {
@@ -226,6 +226,7 @@ const highlightDiagram = async () => {
226226
}
227227
})
228228
if (!isEmpty(removeTaskDefinitionKeyList)) {
229+
// TODO 芋艿：后面 .definitionKey 再看
229230
taskList.value = taskList.value.filter(
230231
(item) => !removeTaskDefinitionKeyList.includes(item.definitionKey)
231232
)
@@ -321,7 +322,7 @@ const elementHover = (element) => {
321322
let optionData = getIntDictOptions(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT)
322323
let dataResult = ''
323324
optionData.forEach((element) => {
324-
if (element.value == task.result) {
325+
if (element.value == task.status) {
325326
dataResult = element.label
326327
}
327328
})
@@ -333,7 +334,7 @@ const elementHover = (element) => {
333334
// <p>部门：${task.assigneeUser.deptName}</p>
334335
// <p>结果：${getIntDictOptions(
335336
// DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT,
336-
// task.result
337+
// task.status
337338
// )}</p>
338339
// <p>创建时间：${formatDate(task.createTime)}</p>`
339340
if (task.endTime) {
@@ -354,14 +355,14 @@ const elementHover = (element) => {
354355
let optionData = getIntDictOptions(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT)
355356
let dataResult = ''
356357
optionData.forEach((element) => {
357-
if (element.value == processInstance.value.result) {
358+
if (element.value == processInstance.value.status) {
358359
dataResult = element.label
359360
}
360361
})
361362
html = `<p>结果：${dataResult}</p>`
362363
// html = `<p>结果：${getIntDictOptions(
363364
// DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT,
364-
// processInstance.value.result
365+
// processInstance.value.status
365366
// )}</p>`
366367
if (processInstance.value.endTime) {
367368
html += `<p>结束时间：${formatDate(processInstance.value.endTime)}</p>`

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<el-table :data="baseTask.children" style="width: 100%" row-key="id" border>
1818
<el-table-column prop="assigneeUser.nickname" label="审批人" />
1919
<el-table-column prop="assigneeUser.deptName" label="所在部门" />
20-
<el-table-column label="审批状态" prop="result">
20+
<el-table-column label="审批状态" prop="status">
2121
<template #default="scope">
22-
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result" />
22+
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.status" />
2323
</template>
2424
</el-table-column>
2525
<el-table-column
@@ -88,7 +88,7 @@ const handleSubSign = (item) => {
8888
const isSubSignButtonVisible = (task: any) => {
8989
if (task && task.children && !isEmpty(task.children)) {
9090
// 有子任务，且子任务有任意一个是 待处理 和 待前置任务完成 则显示减签按钮
91-
const subTask = task.children.find((item) => item.result === 1 || item.result === 9)
91+
const subTask = task.children.find((item) => item.status === 1 || item.status === 9)
9292
return !isEmpty(subTask)
9393
}
9494
return false

‎src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
>
1515
<p style="font-weight: 700">
1616
任务：{{ item.name }}
17-
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="item.result" />
17+
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="item.status" />
1818
<el-button
1919
style="margin-left: 5px"
2020
v-if="!isEmpty(item.children)"
@@ -73,45 +73,45 @@ defineProps({
7373
7474
/** 获得任务对应的 icon */
7575
const getTimelineItemIcon = (item) => {
76-
if (item.result === 1) {
76+
if (item.status === 1) {
7777
return 'el-icon-time'
7878
}
79-
if (item.result === 2) {
79+
if (item.status === 2) {
8080
return 'el-icon-check'
8181
}
82-
if (item.result === 3) {
82+
if (item.status === 3) {
8383
return 'el-icon-close'
8484
}
85-
if (item.result === 4) {
85+
if (item.status === 4) {
8686
return 'el-icon-remove-outline'
8787
}
88-
if (item.result === 5) {
88+
if (item.status === 5) {
8989
return 'el-icon-back'
9090
}
9191
return ''
9292
}
9393
9494
/** 获得任务对应的颜色 */
9595
const getTimelineItemType = (item) => {
96-
if (item.result === 1) {
96+
if (item.status === 1) {
9797
return 'primary'
9898
}
99-
if (item.result === 2) {
99+
if (item.status === 2) {
100100
return 'success'
101101
}
102-
if (item.result === 3) {
102+
if (item.status === 3) {
103103
return 'danger'
104104
}
105-
if (item.result === 4) {
105+
if (item.status === 4) {
106106
return 'info'
107107
}
108-
if (item.result === 5) {
108+
if (item.status === 5) {
109109
return 'warning'
110110
}
111-
if (item.result === 6) {
111+
if (item.status === 6) {
112112
return 'default'
113113
}
114-
if (item.result === 7 || item.result === 8) {
114+
if (item.status === 7 || item.status === 8) {
115115
return 'warning'
116116
}
117117
return ''

‎src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
:rules="formRules"
88
label-width="110px"
99
>
10-
<el-form-item label="退回节点" prop="targetDefinitionKey">
11-
<el-select v-model="formData.targetDefinitionKey" clearable style="width: 100%">
10+
<el-form-item label="退回节点" prop="targetTaskDefinitionKey">
11+
<el-select v-model="formData.targetTaskDefinitionKey" clearable style="width: 100%">
1212
<el-option
1313
v-for="item in returnList"
14-
:key="item.definitionKey"
14+
:key="item.taskDefinitionKey"
1515
:label="item.name"
16-
:value="item.definitionKey"
16+
:value="item.taskDefinitionKey"
1717
/>
1818
</el-select>
1919
</el-form-item>
@@ -35,19 +35,19 @@ const dialogVisible = ref(false) // 弹窗的是否展示
3535
const formLoading = ref(false) // 表单的加载中
3636
const formData = ref({
3737
id: '',
38-
targetDefinitionKey: undefined,
38+
targetTaskDefinitionKey: undefined,
3939
reason: ''
4040
})
4141
const formRules = ref({
42-
targetDefinitionKey: [{ required: true, message: '必须选择回退节点', trigger: 'change' }],
42+
targetTaskDefinitionKey: [{ required: true, message: '必须选择回退节点', trigger: 'change' }],
4343
reason: [{ required: true, message: '回退理由不能为空', trigger: 'blur' }]
4444
})
4545
4646
const formRef = ref() // 表单 Ref
47-
const returnList = ref([])
47+
const returnList = ref([] as any)
4848
/** 打开弹窗 */
4949
const open = async (id: string) => {
50-
returnList.value = await TaskApi.getReturnList({ taskId: id })
50+
returnList.value = await TaskApi.getTaskListByReturn(id)
5151
if (returnList.value.length === 0) {
5252
message.warning('当前没有可回退的节点')
5353
return false
@@ -82,7 +82,7 @@ const submitForm = async () => {
8282
const resetForm = () => {
8383
formData.value = {
8484
id: '',
85-
targetDefinitionKey: undefined,
85+
targetTaskDefinitionKey: undefined,
8686
reason: ''
8787
}
8888
formRef.value?.resetFields()

‎src/views/bpm/processInstance/detail/index.vue

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ const getTaskList = async () => {
254254
tasks.value = []
255255
// 1.1 移除已取消的审批
256256
data.forEach((task) => {
257-
if (task.result !== 4) {
257+
if (task.status !== 4) {
258258
tasks.value.push(task)
259259
}
260260
})
@@ -291,7 +291,10 @@ const loadRunningTask = (tasks) => {
291291
loadRunningTask(task.children)
292292
}
293293
// 2.1 只有待处理才需要
294-
if (task.result !== 1 && task.result !== 6) {
294+
// if (task.status !== 1 && task.status !== 6) {
295+
// return
296+
// }
297+
if (task.status !== 1 && task.status !== 6) {
295298
return
296299
}
297300
// 2.2 自己不是处理人

‎src/views/bpm/task/done/TaskDetail.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
{{ detailData.processInstance.startUserNickname }}
1515
</el-descriptions-item>
1616
<el-descriptions-item label="状态">
17-
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="detailData.result" />
17+
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="detailData.status" />
1818
</el-descriptions-item>
1919
<el-descriptions-item label="原因">
2020
{{ detailData.reason }}

‎src/views/bpm/task/done/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
<el-table-column align="center" label="任务名称" prop="name" />
5151
<el-table-column align="center" label="所属流程" prop="processInstance.name" />
5252
<el-table-column align="center" label="流程发起人" prop="processInstance.startUserNickname" />
53-
<el-table-column align="center" label="状态" prop="result">
53+
<el-table-column align="center" label="审批状态" prop="status">
5454
<template #default="scope">
55-
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result" />
55+
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.status" />
5656
</template>
5757
</el-table-column>
5858
<el-table-column align="center" label="原因" prop="reason" />

‎src/views/bpm/task/todo/index.vue

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -46,27 +46,33 @@
4646
<!-- 列表 -->
4747
<ContentWrap>
4848
<el-table v-loading="loading" :data="list">
49-
<el-table-column align="center" label="任务编号" prop="id" width="300px" />
50-
<el-table-column align="center" label="任务名称" prop="name" />
51-
<el-table-column align="center" label="所属流程" prop="processInstance.name" />
52-
<el-table-column align="center" label="流程发起人" prop="processInstance.startUserNickname" />
49+
<el-table-column align="center" label="流程" prop="processInstance.name" width="180" />
50+
<el-table-column
51+
align="center"
52+
label="发起人"
53+
prop="processInstance.startUser.nickname"
54+
width="100"
55+
/>
5356
<el-table-column
5457
:formatter="dateFormatter"
5558
align="center"
56-
label="创建时间"
59+
label="发起时间"
5760
prop="createTime"
5861
width="180"
5962
/>
60-
<el-table-column label="任务状态" prop="suspensionState">
61-
<template #default="scope">
62-
<el-tag v-if="scope.row.suspensionState === 1" type="success">激活</el-tag>
63-
<el-tag v-if="scope.row.suspensionState === 2" type="warning">挂起</el-tag>
64-
</template>
65-
</el-table-column>
66-
<el-table-column align="center" label="操作">
63+
<el-table-column align="center" label="当前任务" prop="name" width="180" />
64+
<el-table-column
65+
:formatter="dateFormatter"
66+
align="center"
67+
label="任务时间"
68+
prop="createTime"
69+
width="180"
70+
/>
71+
<el-table-column align="center" label="流程编号" prop="id" :show-overflow-tooltip="true" />
72+
<el-table-column align="center" label="任务编号" prop="id" :show-overflow-tooltip="true" />
73+
<el-table-column align="center" label="操作" fixed="right" width="80">
6774
<template #default="scope">
68-
<el-button link type="primary" @click="handleAudit(scope.row)">审批进度</el-button>
69-
<el-button link type="primary" @click="handleCC(scope.row)">抄送</el-button>
75+
<el-button link type="primary" @click="handleAudit(scope.row)">办理</el-button>
7076
</template>
7177
</el-table-column>
7278
</el-table>
@@ -77,16 +83,14 @@
7783
:total="total"
7884
@pagination="getList"
7985
/>
80-
<TaskCCDialogForm ref="taskCCDialogForm" />
8186
</ContentWrap>
8287
</template>
8388

8489
<script lang="ts" setup>
8590
import { dateFormatter } from '@/utils/formatTime'
8691
import * as TaskApi from '@/api/bpm/task'
87-
import TaskCCDialogForm from '../../processInstance/detail/TaskCCDialogForm.vue'
8892
89-
defineOptions({ name: 'BpmDoneTask' })
93+
defineOptions({ name: 'BpmTodoTask' })
9094
9195
const { push } = useRouter() // 路由
9296
@@ -126,7 +130,7 @@ const resetQuery = () => {
126130
}
127131
128132
/** 处理审批按钮 */
129-
const handleAudit = (row) => {
133+
const handleAudit = (row: any) => {
130134
push({
131135
name: 'BpmProcessInstanceDetail',
132136
query: {
@@ -135,12 +139,6 @@ const handleAudit = (row) => {
135139
})
136140
}
137141
138-
const taskCCDialogForm = ref()
139-
/** 处理抄送按钮 */
140-
const handleCC = (row) => {
141-
taskCCDialogForm.value.open(row)
142-
}
143-
144142
/** 初始化 **/
145143
onMounted(() => {
146144
getList()

0 commit comments

Comments
 (0)