驳回至员工修改，不需选人，驳回至审批人，需要选人

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -2,11 +2,9 @@ package com.ruoyi.flowable.service.impl;
 
 
 import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.TypeReference;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.flowable.common.constant.ProcessConstants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysRole;
@@ -38,13 +36,11 @@ import org.flowable.bpmn.model.Process;
 import org.flowable.bpmn.model.*;
 import org.flowable.common.engine.api.FlowableException;
 import org.flowable.common.engine.api.FlowableObjectNotFoundException;
-import org.flowable.common.engine.impl.identity.Authentication;
 import org.flowable.engine.*;
 import org.flowable.engine.history.HistoricActivityInstance;
 import org.flowable.engine.history.HistoricProcessInstance;
 import org.flowable.engine.history.HistoricProcessInstanceQuery;
 import org.flowable.engine.repository.ProcessDefinition;
-import org.flowable.engine.runtime.ActivityInstance;
 import org.flowable.engine.runtime.Execution;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.engine.task.Comment;
@@ -109,10 +105,16 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 runtimeService.setVariable(task.getExecutionId(), "pass", taskVo.getVariables().get("pass"));
                 taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.NORMAL.getRemark(), taskVo.getComment());
             }
-            else {
+            else if (Objects.nonNull(taskVo.getVariables().get("pass")) && taskVo.getVariables().get("pass").equals("驳回")) {
+                runtimeService.setVariable(task.getExecutionId(), "pass", taskVo.getVariables().get("pass"));
                 taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.REJECT.getRemark(), taskVo.getComment());
                 Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
                 taskService.setAssignee(taskVo.getTaskId(), userId.toString());
+            }
+            else {
+                taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.NORMAL.getRemark(), taskVo.getComment());
+                Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
+                taskService.setAssignee(taskVo.getTaskId(), userId.toString());
                 taskService.complete(taskVo.getTaskId(), taskVo.getVariables());
             }
         }

oa-ui/src/components/flow/User/index.vue

@@ -144,7 +144,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 5,
+        pageSize: 8,
         userName: undefined,
         phonenumber: undefined,
         status: undefined,

oa-ui/src/views/flowable/task/todo/detail/index.vue

@@ -103,8 +103,11 @@
         </span>
       </el-dialog>
       <!--驳回流程-->
-      <el-dialog :title="rejectTitle" :visible.sync="rejectOpen" width="40%" append-to-body>
-        <el-form ref="taskForm" :model="taskForm" label-width="80px">
+      <el-dialog :title="rejectTitle" :visible.sync="rejectOpen" width="60%" append-to-body>
+        <el-form ref="taskForm" :model="taskForm">
+          <el-form-item prop="targetKey">
+            <flow-user v-if="checkSendUser" :checkType="checkType" @handleUserSelect="handleUserSelect"></flow-user>
+          </el-form-item>
           <el-form-item label="驳回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
             <el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见" />
           </el-form-item>
@@ -398,17 +401,62 @@ export default {
     handleReject() {
       this.rejectOpen = true;
       this.rejectTitle = "驳回流程";
-    },
-    /** 驳回任务 */
-    taskReject() {
       if (this.taskForm.variables === null) {
         this.taskForm.variables = {};
       }
+      //排他网关，表达式，多节点情况下，审核通过，先将流程表达式pass变量存入，便于查找流程下一节点
       this.$set(this.taskForm.variables, "pass", "驳回");
       complete(this.taskForm).then(response => {
-        this.$modal.msgSuccess(response.msg);
-        this.goBack();
+        const params = { taskId: this.taskForm.taskId }
+        // 根据当前任务或者流程设计配置的下一步节点 todo 暂时未涉及到考虑网关、表达式和多节点情况（todo已在上一步实现）
+        getNextFlowNode(params).then(res => {
+          const data = res.data;
+          if (data) {
+            if (data.dataType === 'dynamic') {
+              if (data.type === 'assignee') { // 指定人员
+                this.checkSendUser = true;
+                this.checkType = "single";
+              } else if (data.type === 'candidateUsers') {  // 候选人员(多个)
+                this.checkSendUser = true;
+                this.checkType = "multiple";
+              } else if (data.type === 'candidateGroups') { // 指定组(所属角色接收任务)
+                this.checkSendRole = true;
+              } else { // 会签
+                // 流程设计指定的 elementVariable 作为会签人员列表
+                this.multiInstanceVars = data.vars;
+                this.checkSendUser = true;
+                this.checkType = "multiple";
+              }
+            }
+          }
+        })
       });
+    },
+    /** 驳回任务 */
+    taskReject() {      
+      if (!this.taskForm.variables && this.checkSendUser) {
+        this.$modal.msgError("请选择流程接收人员!");
+        return;
+      }
+      this.$delete(this.taskForm.variables, "pass");
+      if (this.taskForm && this.formKeyExist) {
+        // 表单是否禁用
+        this.taskForm.formData.formData.disabled = true;
+        // 是否显示按钮
+        this.taskForm.formData.formData.formBtns = false;
+        this.taskForm.variables = Object.assign({}, this.taskForm.variables, this.taskForm.formData.valData);
+        this.taskForm.variables.variables = this.taskForm.formData.formData;
+        complete(this.taskForm).then(response => {
+          this.$modal.msgSuccess(response.msg);
+          this.goBack();
+        });
+      } else {
+        // 流程设计人员类型配置为固定人员接收任务时,直接提交任务到下一步
+        complete(this.taskForm).then(response => {
+          this.$modal.msgSuccess(response.msg);
+          this.goBack();
+        });
+      }
       // this.$refs["taskForm"].validate(valid => {
       //   if (valid) {
       //     rejectTask(this.taskForm).then(res => {