Преглед изворни кода

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

lamphua пре 1 година
родитељ
комит
13cb9fa8e2

+ 10
- 3
oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java Прегледај датотеку

702
         if (StringUtils.isNotBlank(queryVo.getName())){
702
         if (StringUtils.isNotBlank(queryVo.getName())){
703
             taskQuery.processDefinitionNameLike(queryVo.getName());
703
             taskQuery.processDefinitionNameLike(queryVo.getName());
704
         }
704
         }
705
+        if (StringUtils.isNotBlank(queryVo.getCategory())){
706
+            taskQuery.processCategoryIn(Collections.singleton(queryVo.getCategory()));
707
+        }
705
         page.setTotal(taskQuery.count());
708
         page.setTotal(taskQuery.count());
706
         List<Task> taskList = taskQuery.listPage(queryVo.getPageSize() * (queryVo.getPageNum() - 1), queryVo.getPageSize());
709
         List<Task> taskList = taskQuery.listPage(queryVo.getPageSize() * (queryVo.getPageNum() - 1), queryVo.getPageSize());
707
         List<FlowTaskDto> flowList = new ArrayList<>();
710
         List<FlowTaskDto> flowList = new ArrayList<>();
1117
                         // 获取节点信息
1120
                         // 获取节点信息
1118
                         source = flowElement;
1121
                         source = flowElement;
1119
                         List<SequenceFlow> inFlows = FlowableUtils.getElementIncomingFlows(source);
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
                             if (sourceFlowElement instanceof StartEvent) {// 源是开始节点
1125
                             if (sourceFlowElement instanceof StartEvent) {// 源是开始节点
1123
                                 isStartNode = true;
1126
                                 isStartNode = true;
1124
                             }
1127
                             }
1244
                 result.put("formKeyExist", true);
1247
                 result.put("formKeyExist", true);
1245
                 return AjaxResult.success("", result);
1248
                 return AjaxResult.success("", result);
1246
             } else {
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
                 return AjaxResult.success("", result);
1255
                 return AjaxResult.success("", result);
1249
             }
1256
             }
1250
         } else {
1257
         } else {

+ 5
- 0
oa-back/sql/tony-flowable.sql
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 2
- 1
oa-ui/src/views/flowable/task/todo/detail/index.vue Прегледај датотеку

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

Loading…
Откажи
Сачувај