diff --git a/yudao-admin-ui/src/views/oa/leave/approve-hr/index.vue b/yudao-admin-ui/src/views/oa/leave/approve-hr/index.vue index 5e1468cb0..45fd4adb8 100644 --- a/yudao-admin-ui/src/views/oa/leave/approve-hr/index.vue +++ b/yudao-admin-ui/src/views/oa/leave/approve-hr/index.vue @@ -54,8 +54,7 @@ - - 流程图-TODO +
@@ -98,6 +97,7 @@ export default { label: '不同意' } ], + highlightSvgUrl: "", statusFormat(row, column) { return getDictDataLabel(DICT_TYPE.OA_LEAVE_STATUS, row.status) }, @@ -145,8 +145,15 @@ export default { this.leaveApprove.taskId = taskId; this.leaveApprove.processInstanceId = this.$route.query.processInstanceId; this.getForm(businessKey); + this.getHighlightImg(this.leaveApprove.processInstanceId); }, methods: { + getHighlightImg(processInstanceId){ + getHighlightImg(processInstanceId).then(response => { + console.log(response) + this.highlightSvgUrl = response + }) + }, /** 提交按钮 */ submitForm() { this.$refs["taskForm"].validate(valid => { @@ -180,7 +187,6 @@ export default { taskSteps(data).then(response => { this.handleTask = response.data; }); - getHighlightImg(this.leaveApprove.processInstanceId); }, approveChange(){ if (this.leaveApprove.approved === 1) { diff --git a/yudao-admin-ui/src/views/oa/leave/index.vue b/yudao-admin-ui/src/views/oa/leave/index.vue index ef9db1bc6..bb46460bc 100644 --- a/yudao-admin-ui/src/views/oa/leave/index.vue +++ b/yudao-admin-ui/src/views/oa/leave/index.vue @@ -358,6 +358,7 @@ export default { }, /** 审批进度 */ handleStep(row) { + const that = this; const id = row.processInstanceId; processHistorySteps(id).then(response => { this.handleTask.historyTask = response.data;