DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(流程审批): 修复审批任务有任务表单时，表单数据可能获取为空的问题

Browse Source
This commit is contained in:
konbai
2022-09-01 00:16:40 +08:00
parent 16642cf99e
commit c39d3f6de1
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ruoyi-ui/src/views/workflow/work/detail.vue
View File

@@ -3,14 +3,14 @@
<el-tabs tab-position="top" :value="finished === 'true' ? 'approval' : 'form'"> <el-tabs tab-position="top" :value="finished === 'true' ? 'approval' : 'form'">
<el-tab-pane label="任务办理" name="approval" v-if="finished === 'true'"> <el-tab-pane label="任务办理" name="approval" v-if="finished === 'true'">
<el-card class="box-card" shadow="hover" v-if="taskFormOpen"> <!-- <el-card class="box-card" shadow="hover" v-if="taskFormOpen">-->
<div slot="header" class="clearfix"> <!-- <div slot="header" class="clearfix">-->
<span>填写表单</span> <!-- <span>填写表单</span>-->
</div> <!-- </div>-->
<el-col :span="20" :offset="2"> <!-- <el-col :span="20" :offset="2">-->
<parser :form-conf="taskFormData" ref="taskFormParser"/> <!-- <parser :form-conf="taskFormData" ref="taskFormParser"/>-->
</el-col> <!-- </el-col>-->
</el-card> <!-- </el-card>-->
<el-card class="box-card" shadow="hover"> <el-card class="box-card" shadow="hover">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>审批流程</span> <span>审批流程</span>
@@ -447,8 +447,9 @@ export default {
handleComplete() { handleComplete() {
// 校验表单 // 校验表单
const taskFormRef = this.$refs.taskFormParser; const taskFormRef = this.$refs.taskFormParser;
const isExistTaskForm = taskFormRef !== undefined;
// 若无任务表单，则 taskFormPromise 为 true，即不需要校验 // 若无任务表单，则 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 => { taskFormRef.$refs[taskFormRef.formConfCopy.formRef].validate(valid => {
valid ? resolve() : reject() valid ? resolve() : reject()
}) })
@@ -459,7 +460,9 @@ export default {
}) })
}); });
Promise.all([taskFormPromise, approvalPromise]).then(() => { Promise.all([taskFormPromise, approvalPromise]).then(() => {
this.taskForm.variables = taskFormRef?.formData; if (isExistTaskForm) {
this.taskForm.variables = taskFormRef[taskFormRef.formConfCopy.formModel]
}
complete(this.taskForm).then(response => { complete(this.taskForm).then(response => {
this.$modal.msgSuccess(response.msg); this.$modal.msgSuccess(response.msg);
this.goBack(); this.goBack();