From 7f2609af8e02d010b5f2ac830d9b697eeb9660cc Mon Sep 17 00:00:00 2001
From: konbai <1527468660@qq.com>
Date: Sun, 19 Feb 2023 18:06:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1):=20?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E4=BB=BB=E5=8A=A1=E8=8A=82=E7=82=B9?=
=?UTF-8?q?=E9=80=89=E6=8B=A9=E9=A1=BA=E5=BA=8F=E5=AE=A1=E6=89=B9=E4=BC=9A?=
=?UTF-8?q?=E6=B8=85=E9=99=A4=E5=A4=9A=E5=AE=9E=E4=BE=8B=E9=80=89=E9=A1=B9?=
=?UTF-8?q?=E9=97=AE=E9=A2=98[I6FOJ4](https://gitee.com/KonBAI-Q/ruoyi-flo?=
=?UTF-8?q?wable-plus/issues/I6FOJ4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../penal/task/task-components/UserTask.vue | 22 +++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/ruoyi-ui/src/plugins/package/penal/task/task-components/UserTask.vue b/ruoyi-ui/src/plugins/package/penal/task/task-components/UserTask.vue
index 18648fc3..31ef6469 100644
--- a/ruoyi-ui/src/plugins/package/penal/task/task-components/UserTask.vue
+++ b/ruoyi-ui/src/plugins/package/penal/task/task-components/UserTask.vue
@@ -50,7 +50,7 @@
多实例审批方式
-
+
无
会签（需所有审批人同意）
或签（一名审批人同意即可）
@@ -61,7 +61,7 @@
顺序审批：
-
+
@@ -337,7 +337,7 @@ export default {
userTaskForm.candidateUsers = null;
this.showMultiFlog = false;
this.multiLoopType = 'Null';
- this.changeMultiLoopType(this.multiLoopType);
+ this.changeMultiLoopType();
} else {
userTaskForm.candidateUsers = this.selectedUserDate.map(k => k.userId).join() || null;
userTaskForm.text = this.selectedUserDate.map(k => k.nickName).join() || null;
@@ -362,7 +362,7 @@ export default {
userTaskForm.candidateGroups = groups;
userTaskForm.text = text;
this.updateElementTask();
- this.changeMultiLoopType(this.multiLoopType);
+ this.changeMultiLoopType();
},
checkedDeptChange(checkedIds) {
let groups = null;
@@ -394,7 +394,7 @@ export default {
userTaskForm.candidateGroups = groups;
userTaskForm.text = text;
this.updateElementTask();
- this.changeMultiLoopType(this.multiLoopType);
+ this.changeMultiLoopType();
},
changeDataType(val) {
if (val === 'ROLES' || val === 'DEPTS' || (val === 'USERS' && this.selectedUser.ids.length > 1)) {
@@ -402,7 +402,8 @@ export default {
} else {
this.showMultiFlog = false;
}
- this.changeMultiLoopType('Null');
+ this.multiLoopType = 'Null';
+ this.changeMultiLoopType();
// 清空 userTaskForm 所有属性值
Object.keys(userTaskForm).forEach(key => userTaskForm[key] = null);
userTaskForm.dataType = val;
@@ -464,10 +465,9 @@ export default {
}
}
},
- changeMultiLoopType(type) {
- this.multiLoopType = type;
+ changeMultiLoopType() {
// 取消多实例配置
- if (type === "Null") {
+ if (this.multiLoopType === "Null") {
window.bpmnInstances.modeling.updateProperties(this.bpmnElement, { loopCharacteristics: null, assignee: null });
return;
}
@@ -480,11 +480,11 @@ export default {
// 完成条件
let completionCondition = null;
// 会签
- if (type === "SequentialMultiInstance") {
+ if (this.multiLoopType === "SequentialMultiInstance") {
completionCondition = window.bpmnInstances.moddle.create("bpmn:FormalExpression", { body: "${nrOfCompletedInstances >= nrOfInstances}" });
}
// 或签
- if (type === "ParallelMultiInstance") {
+ if (this.multiLoopType === "ParallelMultiInstance") {
completionCondition = window.bpmnInstances.moddle.create("bpmn:FormalExpression", { body: "${nrOfCompletedInstances > 0}" });
}
// 更新模块属性信息