Parcourir la source

根据是否发起人,设置表单可编辑状态

lamphua il y a 1 an
Parent
révision
13cb9fa8e2

+ 10
- 3
oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java Voir le fichier

@@ -702,6 +702,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
702 702
         if (StringUtils.isNotBlank(queryVo.getName())){
703 703
             taskQuery.processDefinitionNameLike(queryVo.getName());
704 704
         }
705
+        if (StringUtils.isNotBlank(queryVo.getCategory())){
706
+            taskQuery.processCategoryIn(Collections.singleton(queryVo.getCategory()));
707
+        }
705 708
         page.setTotal(taskQuery.count());
706 709
         List<Task> taskList = taskQuery.listPage(queryVo.getPageSize() * (queryVo.getPageNum() - 1), queryVo.getPageSize());
707 710
         List<FlowTaskDto> flowList = new ArrayList<>();
@@ -1117,8 +1120,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
1117 1120
                         // 获取节点信息
1118 1121
                         source = flowElement;
1119 1122
                         List<SequenceFlow> inFlows = FlowableUtils.getElementIncomingFlows(source);
1120
-                        if (inFlows.size() == 1) {
1121
-                            FlowElement sourceFlowElement = inFlows.get(0).getSourceFlowElement();
1123
+                        for (SequenceFlow inFlow: inFlows) {
1124
+                            FlowElement sourceFlowElement = inFlow.getSourceFlowElement();
1122 1125
                             if (sourceFlowElement instanceof StartEvent) {// 源是开始节点
1123 1126
                                 isStartNode = true;
1124 1127
                             }
@@ -1244,7 +1247,11 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
1244 1247
                 result.put("formKeyExist", true);
1245 1248
                 return AjaxResult.success("", result);
1246 1249
             } else {
1247
-                result.put("formData", parameters.get("variables"));
1250
+                Map<String, Object> newParameters = JSON.parseObject(JSON.toJSONString(parameters.get("variables")), Map.class);
1251
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
1252
+                flowTaskVo.setTaskId(taskId);
1253
+                newParameters.put("disabled", !((Boolean) checkIsStartUserNode(flowTaskVo).get("data")));
1254
+                result.put("formData", newParameters);
1248 1255
                 return AjaxResult.success("", result);
1249 1256
             }
1250 1257
         } else {

+ 5
- 0
oa-back/sql/tony-flowable.sql
Fichier diff supprimé car celui-ci est trop grand
Voir le fichier


+ 2
- 1
oa-ui/src/views/flowable/task/todo/detail/index.vue Voir le fichier

@@ -23,7 +23,7 @@
23 23
               <!--                <el-button  icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate">委派</el-button>-->
24 24
               <!--                <el-button  icon="el-icon-edit-outline" type="primary" size="mini" @click="handleAssign">转办</el-button>-->
25 25
               <!--                <el-button  icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate">签收</el-button>-->
26
-              <!--              <el-button icon="el-icon-refresh-left" type="warning" size="mini" @click="handleReturn">退回</el-button>-->
26
+                           <el-button icon="el-icon-refresh-left" type="warning" size="mini" @click="handleReturn">退回</el-button>
27 27
                            <el-button icon="el-icon-circle-close" type="danger" size="mini" @click="handleReject">驳回</el-button>
28 28
             </div>
29 29
           </el-col>
@@ -154,6 +154,7 @@ import {
154 154
   getNextFlowNode,
155 155
   delegate,
156 156
   flowTaskForm,
157
+  checkIsStartUserNode
157 158
 } from "@/api/flowable/todo";
158 159
 import flow from '@/views/flowable/task/todo/detail/flow'
159 160
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";

Loading…
Annuler
Enregistrer