diff --git a/src/enums/EsEnum.js b/src/enums/EsEnum.js index 2afaed9e..d191fd1b 100644 --- a/src/enums/EsEnum.js +++ b/src/enums/EsEnum.js @@ -129,7 +129,7 @@ export default class EsEnum { } for (const i in this) { const e = this[i] - if (e.value !== undefined && e.value !== null && e.value.toString().indexOf(value.toString()) !== -1) { + if (e.value !== undefined && e.value !== null && value.toString().indexOf(e.value.toString()) !== -1) { return i } } diff --git a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue index 0ee1903d..48bdc969 100644 --- a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue +++ b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue @@ -775,7 +775,8 @@ export default { this.loading = true const params = { processInstanceId: this.$route.query.processInstanceId, - draftId: this.$route.query.draftId + draftId: this.$route.query.draftId, + taskId: this.$route.query.taskId } queryConsultationProcessDetail(params).then(res => { if (res.success) { @@ -784,6 +785,7 @@ export default { this.processInfo = Object.assign({}, result.basicProcessInfoDTO || {}) // 流程审批信息 this.approvalInfo = Object.assign({}, result.basicTaskInfoDTO || {}) + this.approvalInfo.taskId = this.approvalInfo.taskId || this.$route.query.taskId // 业务基本信息 this.basicServiceInfo = Object.assign({}, result.businessInfoDTO.processFbStandardConsultation || {}) // 业务分派信息