diff --git a/ruoyi-ui/src/views/workflow/work/detail.vue b/ruoyi-ui/src/views/workflow/work/detail.vue index 4f53f472..dff85684 100644 --- a/ruoyi-ui/src/views/workflow/work/detail.vue +++ b/ruoyi-ui/src/views/workflow/work/detail.vue @@ -3,14 +3,14 @@ - -
- 填写表单 -
- - - -
+ + + + + + + +
审批流程 @@ -447,8 +447,9 @@ export default { handleComplete() { // 校验表单 const taskFormRef = this.$refs.taskFormParser; + const isExistTaskForm = taskFormRef !== undefined; // 若无任务表单,则 taskFormPromise 为 true,即不需要校验 - const taskFormPromise = taskFormRef === undefined ? true : new Promise((resolve, reject) => { + const taskFormPromise = !isExistTaskForm ? true : new Promise((resolve, reject) => { taskFormRef.$refs[taskFormRef.formConfCopy.formRef].validate(valid => { valid ? resolve() : reject() }) @@ -459,7 +460,9 @@ export default { }) }); Promise.all([taskFormPromise, approvalPromise]).then(() => { - this.taskForm.variables = taskFormRef?.formData; + if (isExistTaskForm) { + this.taskForm.variables = taskFormRef[taskFormRef.formConfCopy.formModel] + } complete(this.taskForm).then(response => { this.$modal.msgSuccess(response.msg); this.goBack();