diff --git a/src/components/ProcessDetailList.vue b/src/components/ProcessDetailList.vue index 1a935584..373e6fb6 100644 --- a/src/components/ProcessDetailList.vue +++ b/src/components/ProcessDetailList.vue @@ -170,7 +170,7 @@ export default { // 耗时 { title: this.$t('workCenter.processDetail.timeConsuming'), - width: 100, + width: 150, scopedSlots: { customRender: 'timeConsuming' } }, // 审批意见 diff --git a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue index 703f6a13..f50c7296 100644 --- a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue +++ b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue @@ -90,6 +90,7 @@ v-decorator="['standardTextFileName', validatorRules.standardText]" readonly disabled + :title="basicServiceInfo.standardTextFileName" :placeholder="$t('pleaseSelect') + $t('workCenter.standardConsultationProcess.standardText')" /> {{ this.$t('workCenter.standardConsultationProcess.selectText') }} @@ -301,6 +302,7 @@ import { rejectConsultationProcess } from '../../../api/workCenter' import UserSelectModal from '../../../components/selection/UserSelectModal' +import { getFileInfo } from '../../../api/api' export default { name: 'StandardConsultationProcess', @@ -770,7 +772,7 @@ export default { this.currentNode = this.$route.query.nodeId || ConsultationProcess.initiate.value this.initProcessDetailData() } else { - this.currentNode = ConsultationProcess.initial.value + this.currentNode = ConsultationProcess.initiate.value } // 获取人员信息数据 this.getPersonInfoStructure(ProcessKey.CONSULTATION.value, () => { @@ -788,7 +790,7 @@ export default { draftId: this.$route.query.draftId, taskId: this.$route.query.taskId } - queryConsultationProcessDetail(params).then(res => { + queryConsultationProcessDetail(params).then(async res => { if (res.success) { const { result } = res // 处理流程信息 @@ -798,6 +800,9 @@ export default { this.approvalInfo.taskId = this.approvalInfo.taskId || this.$route.query.taskId // 业务基本信息 this.basicServiceInfo = Object.assign({}, result.businessInfoDTO.processFbStandardConsultation || {}) + if (this.currentNode.indexOf(ConsultationProcess.initiate.value) !== -1 && this.basicServiceInfo.standardTextFileId) { + await this.queryFileName() + } // 业务分派信息 this.dispatchInfo = Object.assign({}, result.businessInfoDTO.processFbConsultationUserLink || {}) // 征求意见列表 @@ -816,6 +821,17 @@ export default { this.loading = false }) }, + queryFileName () { + return new Promise(resolve => { + getFileInfo({ id: this.basicServiceInfo.standardTextFileId }).then(res => { + if (res.success) { + this.basicServiceInfo.standardTextFileName = res.result.fileName + } + }).finally(() => { + resolve() + }) + }) + }, switchChange (value) { this.switchValue = value }, @@ -825,6 +841,7 @@ export default { */ handleStandardChange (name) { this.basicServiceInfoForm.setFieldsValue({ standardName: name, standardTextFileName: null }) + delete this.basicServiceInfo.standardTextFileName delete this.basicServiceInfo.standardText delete this.basicServiceInfo.standardTextFileId }, @@ -883,7 +900,8 @@ export default { }, handleEdit (record, index) { record.index = index - this.$refs.consultationModal.edit(null, record) + const pdfId = this.basicServiceInfo.standardTextFileId + this.$refs.consultationModal.edit(pdfId, record) }, /** * 处理页面数据 @@ -1111,8 +1129,8 @@ export default { * @param item */ handleSelectedFile (item) { - console.log(item) this.basicServiceInfoForm.setFieldsValue({ standardTextFileName: item.fileName }) + this.basicServiceInfo.standardTextFileName = item.fileName this.basicServiceInfo.standardText = item.publishBeforeId this.basicServiceInfo.standardTextFileId = item.fileId },