diff --git a/src/views/workflow/task/TaskForm.vue b/src/views/workflow/task/TaskForm.vue index cada2cc..13466ef 100644 --- a/src/views/workflow/task/TaskForm.vue +++ b/src/views/workflow/task/TaskForm.vue @@ -139,7 +139,7 @@ { - //if (valid) { - saveWorkflowCopy(state.auditForm.userIds.join(','), { - processDefId: state.processDefId, - processInsId: data.processInsId, - processDefName: '', - processInsName: state.formTitle, - taskName: '' - }); - //} - //}); + await auditForm.value.validate(); + await saveWorkflowCopy(state.auditForm.userIds.join(','), { + processDefId: state.processDefId, + processInsId: data.processInsId, + processDefName: '', + processInsName: state.formTitle, + taskName: '' + }); } } @@ -396,7 +392,7 @@ if (state.formType === '2') { formPreview.value.startProcessDefinition(async (businessTable: string, businessId: string) => { const processInsId = await startProcessDefinition({ - processDefKey: this.processDefKey, + processDefKey: state.processDefKey, businessTable: businessTable, businessId: businessId, ...vars @@ -407,7 +403,7 @@ }); // 动态表单 } else { - formPreview.value.startFormProcessDefinition({ processDefId: this.processDefId, ...vars }, (processInsId: string) => { + formPreview.value.startFormProcessDefinition({ processDefId: state.processDefId, ...vars }, (processInsId: string) => { close(); push({ path: '/workflow/task/index' }); cc({ processInsId }); @@ -483,7 +479,7 @@ title: '警告', content: '确定终止流程吗?', onOk: async () => { - await stopProcessInstance(this.processInsId, this.auditForm.message); + await stopProcessInstance(state.processInsId, state.auditForm.message); await close(); await push({path: '/workflow/task/index'}); cc({processInsId: state.processInsId}); @@ -498,7 +494,7 @@ /** 驳回到任意节点 */ function rollBack() { - openRollBackTask(true,{ taskId: this.taskId }); + openRollBackTask(true,{ taskId: state.taskId }); } /** 加签 */ @@ -524,12 +520,12 @@ if (state.formType === '2') { formPreview.value.auditTask(async () => { await auditTask({ - taskId: this.taskId, - taskDefKey: this.taskDefKey, - processInsId: this.processInsId, - processDefId: this.processDefId, - activityCommentInfo: this.auditForm, - assignee: this.auditForm.assignee, + taskId: state.taskId, + taskDefKey: state.taskDefKey, + processInsId: state.processInsId, + processDefId: state.processDefId, + activityCommentInfo: state.auditForm, + assignee: state.auditForm.assignee, vars, }); await close(); @@ -539,11 +535,12 @@ // 动态表单审批 } else { formPreview.value.auditFormTask({ - taskId: this.taskId, - processInsId: this.processInsId, - activityCommentInfo: this.auditForm, - assignee: this.auditForm.assignee, - vars, + formType: '', + taskId: state.taskId, + processInsId: state.processInsId, + activityCommentInfo: state.auditForm, + assignee: state.auditForm.assignee, + vars }, () => { close(); push({ path: '/workflow/task/index' }); @@ -555,9 +552,9 @@ /** 处理回退到任意节点 */ async function handleRollBackTask(backTaskDefKey: string) { await rejectTask({ - currentTaskId: this.taskId, + currentTaskId: state.taskId, rollBackTaskDefKey: backTaskDefKey, - comment: this.auditForm + comment: state.auditForm }); await close(); await push({ path: '/workflow/task/index' }); @@ -566,7 +563,7 @@ /** 处理转派任务 */ async function handleTransferTask(userList: KiccUser[]) { - await transferTask( this.taskId, userList[0].id); + await transferTask( state.taskId, userList[0].id); await close(); await push({ path: '/workflow/task/index' }); cc({ processInsId: state.processInsId }); @@ -574,7 +571,7 @@ /** 处理任务委派 */ async function handleDelegateTask(userList: KiccUser[]) { - await delegateTask(this.taskId, userList[0].id); + await delegateTask(state.taskId, userList[0].id); await close(); await push({ path: '/workflow/task/index' }); cc({ processInsId: state.processInsId }); @@ -658,10 +655,6 @@ } } - function test() { - auditForm.value.validate(); - } -