Przeglądaj źródła

修改提交任务

余思翰 1 rok temu
rodzic
commit
ee4e858278

+ 1
- 1
oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java Wyświetl plik

@@ -1250,7 +1250,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
1250 1250
                 Map<String, Object> newParameters = JSON.parseObject(JSON.toJSONString(parameters.get("variables")), Map.class);
1251 1251
                 FlowTaskVo flowTaskVo = new FlowTaskVo();
1252 1252
                 flowTaskVo.setTaskId(taskId);
1253
-                newParameters.put("disabled", !((Boolean) checkIsStartUserNode(flowTaskVo).get("data")));
1253
+//                newParameters.put("disabled", !((Boolean) checkIsStartUserNode(flowTaskVo).get("data")));
1254 1254
                 result.put("formData", newParameters);
1255 1255
                 return AjaxResult.success("", result);
1256 1256
             }

+ 2
- 1
oa-ui/src/views/flowable/form/scForm.vue Wyświetl plik

@@ -2,7 +2,7 @@
2 2
  * @Author: ysh
3 3
  * @Date: 2024-01-19 16:29:01
4 4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-01-29 15:46:38
5
+ * @LastEditTime: 2024-01-29 16:51:20
6 6
 -->
7 7
 <template>
8 8
   <div>
@@ -143,6 +143,7 @@ export default {
143 143
     submit(tableForm) {
144 144
       MessageBox.confirm('确认提交?', '任务提交', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => {
145 145
         tableForm.formId = new Snowflake(1n, 1n, 0n).nextId().toString();
146
+        tableForm.disabled = true;
146 147
         console.log(tableForm);
147 148
         let formData = new FormData();
148 149
         let form = JSON.stringify(tableForm);

+ 7
- 7
oa-ui/src/views/flowable/task/myProcess/send/index.vue Wyświetl plik

@@ -17,7 +17,7 @@
17 17
           </el-col>
18 18
         </el-tab-pane> -->
19 19
         <el-tab-pane label="表单信息" name="1">
20
-          <scform @submit="submits"></scform>
20
+          <scform @submit="submitForm"></scform>
21 21
         </el-tab-pane>
22 22
         <!--流程图-->
23 23
         <el-tab-pane label="流程图" name="2">
@@ -56,7 +56,7 @@ export default {
56 56
     FlowUser,
57 57
     FlowRole,
58 58
     scform
59
-},
59
+  },
60 60
   props: {},
61 61
   data() {
62 62
     return {
@@ -98,6 +98,8 @@ export default {
98 98
     submits(form) {
99 99
       getNextFlowNodeByStart({ deploymentId: this.deployId, variables: {} }).then(res => {
100 100
         let data = res.data
101
+        debugger
102
+        console.log(form);
101 103
         if (data.dataType === 'dynamic') {
102 104
           if (data.type === 'assignee') { // 指定人员
103 105
             this.checkSendUser = true;
@@ -229,16 +231,14 @@ export default {
229 231
         this.$modal.msgError("请选择流程接收角色组!");
230 232
         return;
231 233
       }
232
-      if (this.formData.aaa) {
234
+      if (this.formData.formData == undefined) {
233 235
         definitionStart(this.procDefId, { approval: this.checkValues }).then(res => {
234 236
           this.$modal.msgSuccess(res.msg);
235 237
           this.goBack();
236 238
         })
237
-
238
-      }
239
-      if (this.formData) {
239
+      }else if (this.formData) {
240 240
         const variables = this.formData.valData;
241
-        const formData = this.formData.formData;
241
+        let formData = this.formData.formData;
242 242
         // 表单是否禁用
243 243
         formData.disabled = true;
244 244
         // 是否显示按钮

Ładowanie…
Anuluj
Zapisz