Skip to content

Commit 43b7dff

Browse files
committed
【功能调整】工作流:工作流程的流转记录,不区分父子任务
1 parent dcdce41 commit 43b7dff

File tree

15 files changed

+819
-1681
lines changed

15 files changed

+819
-1681
lines changed

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,24 +53,26 @@
5353
/>
5454
<el-table-column
5555
label="审批人"
56-
prop="assigneeUser.nickname"
5756
min-width="100"
5857
align="center"
5958
v-if="selectActivityType === 'bpmn:UserTask'"
60-
/>
59+
>
60+
<template #default="scope">
61+
{{ scope.row.assigneeUser?.nickname || scope.row.ownerUser?.nickname }}
62+
</template>
63+
</el-table-column>
6164
<el-table-column
6265
label="发起人"
6366
prop="assigneeUser.nickname"
6467
min-width="100"
6568
align="center"
6669
v-else
6770
/>
68-
<el-table-column
69-
label="部门"
70-
prop="assigneeUser.deptName"
71-
min-width="100"
72-
align="center"
73-
/>
71+
<el-table-column label="部门" min-width="100" align="center">
72+
<template #default="scope">
73+
{{ scope.row.assigneeUser?.deptName || scope.row.ownerUser?.deptName }}
74+
</template>
75+
</el-table-column>
7476
<el-table-column
7577
:formatter="dateFormatter"
7678
align="center"

src/router/modules/remaining.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
292292
},
293293
{
294294
path: 'process-instance/detail',
295-
component: () => import('@/views/bpm/processInstance/detail/index_new.vue'),
296-
//component: () => import('@/views/bpm/processInstance/detail/index.vue'),
295+
component: () => import('@/views/bpm/processInstance/detail/index.vue'),
297296
name: 'BpmProcessInstanceDetail',
298297
meta: {
299298
noCache: true,

0 commit comments

Comments
 (0)