diff --git a/src/views/flowable/task/todo/detail/index.vue b/src/views/flowable/task/todo/detail/index.vue index 0b078e9..9784171 100644 --- a/src/views/flowable/task/todo/detail/index.vue +++ b/src/views/flowable/task/todo/detail/index.vue @@ -1159,13 +1159,12 @@ export default { if (this.category == 'enlistmentReserve') { + this.form.enlistmentReserveApprovalList.push({nodeName: "学生申请"}) // 过滤returnTaskList,保留documentation在flowRecordList的taskName中存在的项 this.returnTaskList = this.returnTaskList.filter(returnTask => { // 检查flowRecordList中是否有项的taskName等于当前returnTask的documentation - return this.flowRecordList.some(record => record.taskName === returnTask.documentation) + return this.form.enlistmentReserveApprovalList.some(record => record.nodeName === returnTask.documentation) }) - console.log(this.flowRecordList); - } this.initApproval() }) @@ -1180,9 +1179,9 @@ export default { if (element.id == this.taskForm.targetKey) { this.taskForm.variables.targetNodeName = element.documentation } - }); - } - + }) + } + this.$refs['taskForm'].validate((valid) => { if (valid) { returnTask(this.taskForm).then((res) => { diff --git a/src/views/routine/enlistmentReserve/index.vue b/src/views/routine/enlistmentReserve/index.vue index 40b154f..5e55112 100644 --- a/src/views/routine/enlistmentReserve/index.vue +++ b/src/views/routine/enlistmentReserve/index.vue @@ -126,7 +126,7 @@ v-hasPermi="['routine:enlistmentReserve:edit']" v-if="scope.row.applyStatus == 0">修改 删除 - 详情