From 8453a7cbb7c68360f11bec6b208b1d52746540d2 Mon Sep 17 00:00:00 2001
From: tony <846249920@qq.com>
Date: Sat, 29 Jan 2022 18:25:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=8E=A5=E6=94=B6=E4=BB=BB=E5=8A=A1=E6=97=B6?=
 =?UTF-8?q?,=E4=BA=BA=E5=91=98=E9=80=89=E6=8B=A9=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=9C=AA=E9=9A=90=E8=97=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/constant/ProcessConstants.java     |   5 +
 .../service/impl/FlowTaskServiceImpl.java     |   3 +
 .../src/views/flowable/definition/index.vue   |   2 +-
 .../src/views/flowable/task/process/index.vue |  45 ++++++-
 .../src/views/flowable/task/record/index.vue  | 115 +++++++++---------
 5 files changed, 111 insertions(+), 59 deletions(-)

diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/constant/ProcessConstants.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/constant/ProcessConstants.java
index 2b81805..dc55dfa 100644
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/constant/ProcessConstants.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/constant/ProcessConstants.java
@@ -13,6 +13,11 @@ public class ProcessConstants {
      */
     public static final String DATA_TYPE = "dynamic";
 
+    /**
+     * 固定任务接收
+     */
+    public static final String FIXED = "fixed";
+
     /**
      * 单个审批人
      */
diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
index 9eb573e..8e2b349 100644
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
@@ -882,6 +882,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                         String dataType = userTask.getAttributeValue(ProcessConstants.NAMASPASE, ProcessConstants.PROCESS_CUSTOM_DATA_TYPE);
                         String userType = userTask.getAttributeValue(ProcessConstants.NAMASPASE, ProcessConstants.PROCESS_CUSTOM_USER_TYPE);
 
+                        // 处理加载动态指定下一节点接收人员信息
                         if (ProcessConstants.DATA_TYPE.equals(dataType)) {
                             // 指定单个人员
                             if (ProcessConstants.USER_TYPE_ASSIGNEE.equals(userType)) {
@@ -907,6 +908,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                                 flowNextDto.setType(ProcessConstants.USER_TYPE_ROUPS);
                                 flowNextDto.setRoleList(sysRoles);
                             }
+                        }else{
+                            flowNextDto.setType(ProcessConstants.FIXED);
                         }
                     }
                 }
diff --git a/ruoyi-ui/src/views/flowable/definition/index.vue b/ruoyi-ui/src/views/flowable/definition/index.vue
index 675b72e..488453b 100644
--- a/ruoyi-ui/src/views/flowable/definition/index.vue
+++ b/ruoyi-ui/src/views/flowable/definition/index.vue
@@ -70,7 +70,7 @@
     <el-table v-loading="loading" fit :data="definitionList" border   @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="流程编号" align="center" prop="deploymentId" :show-overflow-tooltip="true"/>
-      <el-table-column label="流程标识" align="center" prop="key" :show-overflow-tooltip="true" />
+      <el-table-column label="流程标识" align="center" prop="flowKey" :show-overflow-tooltip="true" />
       <el-table-column label="流程分类" align="center" prop="category" />
       <el-table-column label="流程名称" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
diff --git a/ruoyi-ui/src/views/flowable/task/process/index.vue b/ruoyi-ui/src/views/flowable/task/process/index.vue
index dca730b..06ff94e 100644
--- a/ruoyi-ui/src/views/flowable/task/process/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/process/index.vue
@@ -116,6 +116,21 @@
 
     <!-- 发起流程 -->
     <el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
+      <el-form :model="queryProcessParams" ref="queryProcessForm" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="名称" prop="name">
+          <el-input
+            v-model="queryProcessParams.name"
+            placeholder="请输入名称"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleProcessQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetProcessQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
       <el-table v-loading="processLoading" fit :data="definitionList" border >
         <el-table-column label="流程名称" align="center" prop="name" />
         <el-table-column label="流程版本" align="center">
@@ -138,8 +153,8 @@
       <pagination
         v-show="processTotal>0"
         :total="processTotal"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
+        :page.sync="queryProcessParams.pageNum"
+        :limit.sync="queryProcessParams.pageSize"
         @pagination="listDefinition"
       />
     </el-dialog>
@@ -200,6 +215,20 @@ export default {
         parentDeploymentId: null,
         engineVersion: null
       },
+      // 查询参数
+      queryProcessParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        category: null,
+        key: null,
+        tenantId: null,
+        deployTime: null,
+        derivedFrom: null,
+        derivedFromRoot: null,
+        parentDeploymentId: null,
+        engineVersion: null
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -251,6 +280,16 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    /** 搜索按钮操作 */
+    handleProcessQuery() {
+      this.queryProcessParams.pageNum = 1;
+      this.listDefinition();
+    },
+    /** 重置按钮操作 */
+    resetProcessQuery() {
+      this.resetForm("queryProcessForm");
+      this.handleProcessQuery();
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
@@ -264,7 +303,7 @@ export default {
       this.listDefinition();
     },
     listDefinition(){
-      listDefinition(this.queryParams).then(response => {
+      listDefinition(this.queryProcessParams).then(response => {
         this.definitionList = response.data.records;
         this.processTotal = response.data.total;
         this.processLoading = false;
diff --git a/ruoyi-ui/src/views/flowable/task/record/index.vue b/ruoyi-ui/src/views/flowable/task/record/index.vue
index eb64c97..ea69d37 100644
--- a/ruoyi-ui/src/views/flowable/task/record/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/record/index.vue
@@ -71,56 +71,58 @@
 
     <!--审批正常流程-->
     <el-dialog :title="completeTitle" :visible.sync="completeOpen" width="60%" append-to-body>
-      <el-row :gutter="20">
-        <!--部门数据-->
-        <el-col :span="4" :xs="24">
-          <h6>部门列表</h6>
-          <div class="head-container">
-            <el-input
-              v-model="deptName"
-              placeholder="请输入部门名称"
-              clearable
-              size="small"
-              prefix-icon="el-icon-search"
-              style="margin-bottom: 20px"
-            />
-          </div>
-          <div class="head-container">
-            <el-tree
-              :data="deptOptions"
-              :props="defaultProps"
-              :expand-on-click-node="false"
-              :filter-node-method="filterNode"
-              ref="tree"
-              default-expand-all
-              @node-click="handleNodeClick"
-            />
-          </div>
-        </el-col>
-        <el-col :span="12" :xs="24">
-          <h6>待选人员</h6>
-          <el-table
-            ref="singleTable"
-            :data="userList"
-            border
-            style="width: 100%"
-            @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="50" align="center" />
-            <el-table-column label="用户名" align="center" prop="nickName" />
-            <el-table-column label="部门" align="center" prop="dept.deptName" />
-          </el-table>
-        </el-col>
-        <el-col :span="8" :xs="24">
-          <h6>已选人员</h6>
-          <el-tag
-            v-for="tag in userData"
-            :key="tag.nickName"
-            closable
-            @close="handleClose(tag)">
-            {{tag.nickName}} {{tag.dept.deptName}}
-          </el-tag>
-        </el-col>
-      </el-row>
+      <div v-if="checkSendUser">
+        <el-row :gutter="20">
+          <!--部门数据-->
+          <el-col :span="4" :xs="24">
+            <h6>部门列表</h6>
+            <div class="head-container">
+              <el-input
+                v-model="deptName"
+                placeholder="请输入部门名称"
+                clearable
+                size="small"
+                prefix-icon="el-icon-search"
+                style="margin-bottom: 20px"
+              />
+            </div>
+            <div class="head-container">
+              <el-tree
+                :data="deptOptions"
+                :props="defaultProps"
+                :expand-on-click-node="false"
+                :filter-node-method="filterNode"
+                ref="tree"
+                default-expand-all
+                @node-click="handleNodeClick"
+              />
+            </div>
+          </el-col>
+          <el-col :span="12" :xs="24">
+            <h6>待选人员</h6>
+            <el-table
+              ref="singleTable"
+              :data="userList"
+              border
+              style="width: 100%"
+              @selection-change="handleSelectionChange">
+              <el-table-column type="selection" width="50" align="center" />
+              <el-table-column label="用户名" align="center" prop="nickName" />
+              <el-table-column label="部门" align="center" prop="dept.deptName" />
+            </el-table>
+          </el-col>
+          <el-col :span="8" :xs="24">
+            <h6>已选人员</h6>
+            <el-tag
+              v-for="tag in userData"
+              :key="tag.nickName"
+              closable
+              @close="handleClose(tag)">
+              {{tag.nickName}} {{tag.dept.deptName}}
+            </el-tag>
+          </el-col>
+        </el-row>
+      </div>
       <span slot="footer" class="dialog-footer">
         <el-input style="width: 50%;margin-right: 34%" type="textarea" v-model="taskForm.comment" placeholder="请输入处理意见"/>
         <el-button @click="completeOpen = false">取 消</el-button>
@@ -241,6 +243,7 @@ export default {
       rejectOpen: false,
       rejectTitle: null,
       userData:[],
+      checkSendUser: false // 是否展示选择人员模块
     };
   },
   created() {
@@ -396,23 +399,25 @@ export default {
       getNextFlowNode(params).then(res => {
         const data = res.data;
         if (data) {
-          if (data.type === 'assignee') {
+          this.checkSendUser = true
+          if (data.type === 'assignee') { // 指定人员
             this.userDataList = res.data.userList;
-          } else if (data.type === 'candidateUsers') {
+          } else if (data.type === 'candidateUsers') {  // 指定人员(多个)
             this.userDataList = res.data.userList;
             this.taskForm.multiple = true;
-          } else if (data.type === 'candidateGroups') {
+          } else if (data.type === 'candidateGroups') { // 指定组(所属角色接收任务)
             res.data.roleList.forEach(role => {
               role.userId = role.roleId;
               role.nickName = role.roleName;
             })
             this.userDataList = res.data.roleList;
             this.taskForm.multiple = false;
-          } else if (data.type === 'multiInstance') {
+          } else if (data.type === 'multiInstance') { // 会签?
             this.userDataList = res.data.userList;
             this.taskForm.multiple = true;
+          }else if (data.type === 'fixed') { // 已经固定人员接收下一任务
+            this.checkSendUser = false;
           }
-          this.taskForm.sendUserShow = true;
         }
       })
     },