Merge branch 'feature/bpm' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into feature/bpm

This commit is contained in:
jason
2024-10-20 21:51:48 +08:00
19 changed files with 867 additions and 1757 deletions

View File

@ -53,11 +53,14 @@
/>
<el-table-column
label="审批人"
prop="assigneeUser.nickname"
min-width="100"
align="center"
v-if="selectActivityType === 'bpmn:UserTask'"
/>
>
<template #default="scope">
{{ scope.row.assigneeUser?.nickname || scope.row.ownerUser?.nickname }}
</template>
</el-table-column>
<el-table-column
label="发起人"
prop="assigneeUser.nickname"
@ -65,12 +68,11 @@
align="center"
v-else
/>
<el-table-column
label="部门"
prop="assigneeUser.deptName"
min-width="100"
align="center"
/>
<el-table-column label="部门" min-width="100" align="center">
<template #default="scope">
{{ scope.row.assigneeUser?.deptName || scope.row.ownerUser?.deptName }}
</template>
</el-table-column>
<el-table-column
:formatter="dateFormatter"
align="center"