From f8a4d8f9a7f236a78c389c9c1367deaeb018be30 Mon Sep 17 00:00:00 2001
From: tony <846249920@qq.com>
Date: Wed, 14 Dec 2022 16:25:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=80=99=E9=80=89=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E7=BB=84=E5=8F=AF=E9=80=89=E8=A1=A8=E8=BE=BE=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Process/components/nodePanel/task.vue         |  6 +++++-
 .../src/views/flowable/task/todo/detail/index.vue | 15 +++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ruoyi-ui/src/components/Process/components/nodePanel/task.vue b/ruoyi-ui/src/components/Process/components/nodePanel/task.vue
index ee0b891a..2230626c 100644
--- a/ruoyi-ui/src/components/Process/components/nodePanel/task.vue
+++ b/ruoyi-ui/src/components/Process/components/nodePanel/task.vue
@@ -39,7 +39,9 @@
           <!--候选角色-->
 <!--          <el-button slot="append" size="mini" icon="el-icon-user" @click="singleRoleCheck"></el-button>-->
 <!--          <el-divider direction="vertical"></el-divider>-->
-          <el-button slot="append" size="mini" icon="el-icon-tickets" @click="multipleRoleCheck"></el-button>
+          <el-button slot="append" size="mini" icon="el-icon-user" @click="multipleRoleCheck"></el-button>
+          <!--选择表达式-->
+          <el-button slot="append" size="mini" icon="el-icon-tickets" @click="singleExpCheck('candidateGroups')"></el-button>
         </el-input>
       </template>
     </x-form>
@@ -628,6 +630,8 @@ export default {
         this.updateProperties({'flowable:assignee': selection.id.toString()});
       }else if ("candidateUsers" === this.expType) {
         this.updateProperties({'flowable:candidateUsers': selection.id.toString()});
+      }else if ("candidateGroups" === this.expType) {
+        this.updateProperties({'flowable:candidateGroups': selection.id.toString()});
       }
       this.checkValues = selection.name;
       this.expType = null;
diff --git a/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue b/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue
index 1c21fb54..03b7eadd 100644
--- a/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue
@@ -443,18 +443,17 @@ export default {
     },
     /** 审批任务 */
     taskComplete() {
-      const that = this
-      if (!that.taskForm.values && that.checkSendUser){
-        that.msgError("请选择流程接收人员");
+      if (!this.taskForm.values && this.checkSendUser){
+        this.msgError("请选择流程接收人员");
         return;
       }
-      if (!that.taskForm.comment){
-        that.msgError("请输入审批意见");
+      if (!this.taskForm.comment){
+        this.msgError("请输入审批意见");
         return;
       }
-      complete(that.taskForm).then(response => {
-        that.msgSuccess(response.msg);
-        that.goBack();
+      complete(this.taskForm).then(response => {
+        this.msgSuccess(response.msg);
+        this.goBack();
       });
     },
     /** 委派任务 */