diff --git a/ruoyi-ui/src/views/flowable/task/record/index.vue b/ruoyi-ui/src/views/flowable/task/record/index.vue index 597d33c..c8b8db2 100644 --- a/ruoyi-ui/src/views/flowable/task/record/index.vue +++ b/ruoyi-ui/src/views/flowable/task/record/index.vue @@ -8,17 +8,12 @@ - -
- - - - -
-
+
+ +
-
+
@@ -39,7 +34,7 @@ - +
@@ -147,6 +142,7 @@ export default { formConf: {}, // 默认表单数据 formConfOpen: false, // 是否加载默认表单数据 variables: [], // 流程变量数据 + variablesData: {}, // 流程变量数据 variableOpen: false, // 是否加载流程变量数据 returnTaskList: [], // 回退列表数据 finished: false, @@ -228,7 +224,8 @@ export default { processVariables(taskId) { if (taskId) { getProcessVariables(taskId).then(res => { - this.variables = res.data.variables; + // this.variables = res.data.variables; + this.variablesData = res.data.variables; this.variableOpen = true }); const params = { @@ -288,25 +285,12 @@ export default { /** 申请流程表单数据提交 */ submitForm(data) { if (data) { - const variableList = []; - data.fields.forEach(item => { - let variableData = {}; - variableData.label = item.__config__.label - // 表单值为多个选项时 - if (item.__config__.defaultValue instanceof Array) { - const array = []; - item.__config__.defaultValue.forEach(val => { - array.push(val) - }) - variableData.val = array; - } else { - variableData.val = item.__config__.defaultValue - } - variableList.push(variableData) - }) + const formData = data; + formData.disabled = true; + formData.formBtns = false; if (this.taskForm.procDefId) { let variables = { - "variables": variableList + "variables": formData } // 启动流程并将表单数据加入流程变量 definitionStart(this.taskForm.procDefId, JSON.stringify(variables)).then(res => {