Web/admin-sjzx
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

流程图时间和结果，流程审核表单默认勾选

Browse Source
This commit is contained in:
sjl
2025-12-16 11:15:27 +08:00
parent 72d836020b
commit 7b9f5302d0
3 changed files with 71 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue
View File

@@ -279,6 +279,27 @@ const getResultCss = (status) => {
return ''
}
const getTaskNameItemType = (itemStatus: any) => {
if (itemStatus === 1) {
return '审批中'
}else if (itemStatus === 2) {
return '审批通过'
}else if (itemStatus === 3) {
return '审批不通过'
}else if (itemStatus === 4) {
return '已取消'
}else if (itemStatus === 5) {
return '退回'
} else if (itemStatus === 6) {
return '委派'
} else if (itemStatus === 7) {
return '审批通过中'
} else if (itemStatus === 0) {
return '待审批'
}
return ''
}
const getActivityOutgoing = (activity) => {
// 如果有 outgoing，则直接使用它
if (activity.outgoing && activity.outgoing.length > 0) {
@@ -316,7 +337,9 @@ const elementHover = (element) => {
!overlays.value && (overlays.value = bpmnModeler.get('overlays'))
// 展示信息
// console.log(activityLists.value, 'activityLists.value')
// console.log(element.value, 'element.value')
if (element.value.type === 'bpmn:SequenceFlow') {
return
}
const activity = activityLists.value.find((m) => m.key === element.value.id)
// console.log(activity, 'activityactivityactivityactivity')
if (!activity) {
@@ -328,25 +351,24 @@ const elementHover = (element) => {
<p>Elemet type: ${element.value.type}</p>
</div>` // 默认值
if (element.value.type === 'bpmn:StartEvent' && processInstance.value) {
html = `<p>发起人：${processInstance.value.startUser.name}</p>
<p>部门：${processInstance.value.startUser.deptName}</p>
<p>创建时间：${formatDate(processInstance.value.createTime)}`
<p>创建时间：${formatDate(processInstance.value.startTime)}`
} else if (element.value.type === 'bpmn:UserTask') {
let task = taskList.value.find((m) => m.id === activity.taskId) // 找到活动对应的 taskId
if (!task) {
return
}
let optionData = getIntDictOptions(DICT_TYPE.BPM_TASK_STATUS)
let dataResult = ''
optionData.forEach((element) => {
if (element.value == task.status) {
dataResult = element.label
}
})
// let optionData = getIntDictOptions(DICT_TYPE.BPM_TASK_STATUS)
// let dataResult = ''
// optionData.forEach((element) => {
// if (element.value == task.status) {
// dataResult = element.label
// }
// })
html = `<p>审批人：${task.assigneeUser.name}</p>
<p>部门：${task.assigneeUser.deptName}</p>
<p>结果：${dataResult}</p>
<p>结果：${getTaskNameItemType(task.status)}</p>
<p>创建时间：${formatDate(task.createTime)}</p>`
// html = `<p>审批人：${task.assigneeUser.nickname}</p>
// <p>部门：${task.assigneeUser.deptName}</p>
@@ -369,20 +391,20 @@ const elementHover = (element) => {
html += `<p>结束时间：${formatDate(activity.endTime)}</p>`
}
} else if (element.value.type === 'bpmn:EndEvent' && processInstance.value) {
let optionData = getIntDictOptions(DICT_TYPE.BPM_TASK_STATUS)
let dataResult = ''
optionData.forEach((element) => {
if (element.value == processInstance.value.status) {
dataResult = element.label
}
})
html = `<p>结果：${dataResult}</p>`
// let optionData = getIntDictOptions(DICT_TYPE.BPM_TASK_STATUS)
// let dataResult = ''
// optionData.forEach((element) => {
// if (element.value == processInstance.value.status) {
// dataResult = element.label
// }
// })
// html = `<p>结果：${dataResult}</p>`
// html = `<p>结果：${getIntDictOptions(
// DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT,
// processInstance.value.status
// )}</p>`
if (processInstance.value.endTime) {
html += `<p>结束时间：${formatDate(processInstance.value.endTime)}</p>`
html = `<p>结束时间：${formatDate(processInstance.value.endTime)}</p>`
}
}
elementOverlayIds.value[element.value.id] = toRaw(overlays.value)?.add(element.value, {
@@ -661,7 +683,7 @@ watch(
}
.element-overlays {
width: 200px;
width: 250px;
padding: 8px;
color: #fafafa;
background: rgb(0 0 0 / 60%);