hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-13 18:45:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

暂时回退流程推断的能力

Browse Source
This commit is contained in:
YunaiV
2022-07-08 01:38:19 +08:00
parent ed28d6d5ed
commit 0a2599152d
12 changed files with 38 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue
View File

@ -116,10 +116,11 @@ export default {
let todoActivity = activityList.find(m => !m.endTime) // 找到待办的任务
let endActivity = activityList[activityList.length - 1] // 获得最后一个任务
// debugger
console.log(this.bpmnModeler.getDefinitions().rootElements[0].flowElements);
// console.log(this.bpmnModeler.getDefinitions().rootElements[0].flowElements);
this.bpmnModeler.getDefinitions().rootElements[0].flowElements?.forEach(n => {
let activity = activityList.find(m => m.key === n.id) // 找到对应的活动
if (n.$type === 'bpmn:UserTask') { // 用户任务
debugger
if (!activity) {
return;
}

34
yudao-ui-admin/src/views/bpm/processInstance/detail.vue
View File

@ -232,21 +232,27 @@ export default {
this.auditForms = [];
getTaskListByProcessInstanceId(this.id).then(response => {
// 审批记录
this.tasks = response.data;
this.tasks = [];
// 移除已取消的审批
response.data.forEach(task => {
if (task.result !== 4) {
this.tasks.push(task);
}
});
// 排序，将未完成的排在前面，已完成的排在后面；
// this.tasks.sort((a, b) => {
// // 有已完成的情况，按照完成时间倒序
// if (a.endTime && b.endTime) {
// return b.endTime - a.endTime;
// } else if (a.endTime) {
// return 1;
// } else if (b.endTime) {
// return -1;
// // 都是未完成，按照创建时间倒序
// } else {
// return b.createTime - a.createTime;
// }
// });
this.tasks.sort((a, b) => {
// 有已完成的情况，按照完成时间倒序
if (a.endTime && b.endTime) {
return b.endTime - a.endTime;
} else if (a.endTime) {
return 1;
} else if (b.endTime) {
return -1;
// 都是未完成，按照创建时间倒序
} else {
return b.createTime - a.createTime;
}
});
// 需要审核的记录
const userId = store.getters.userId;