diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue index ac0025df..bf65f520 100644 --- a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue +++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue @@ -134,7 +134,7 @@ export default { title: this.$t('enterpriseStandardLibrary.plan.revisionType'), align: 'center', width: 180, - dataIndex: 'applicationCategory_dictText', + dataIndex: 'projectType_dictText', scopedSlots: { customRender: 'text' } }, { // 原企标编号 @@ -169,56 +169,56 @@ export default { title: this.$t('enterpriseStandardLibrary.plan.authDepartment'), align: 'center', width: 180, - dataIndex: 'authDeparts', + dataIndex: 'authDept_dictText', scopedSlots: { customRender: 'text' } }, { // 企业标准代号 title: this.$t('enterpriseStandardLibrary.plan.enterpriseStandardCode'), align: 'center', width: 180, - dataIndex: 'enStandardCode', + dataIndex: 'enStandardCode_dictText', scopedSlots: { customRender: 'text' } }, { // 配合单位 title: this.$t('enterpriseStandardLibrary.plan.suitUnit'), align: 'center', width: 180, - dataIndex: 'cooperateDeparts', + dataIndex: 'cooperationUnit_dictText', scopedSlots: { customRender: 'text' } }, { // 主起草人 title: this.$t('enterpriseStandardLibrary.plan.principalDrafter'), align: 'center', width: 180, - dataIndex: 'mainDraftingUser', + dataIndex: 'mainDraftingUser_dictText', scopedSlots: { customRender: 'text' } }, { // 主起草单位 title: this.$t('enterpriseStandardLibrary.plan.mainDraftingUnit'), align: 'center', width: 180, - dataIndex: 'mainDraftingUnit', + dataIndex: 'mainDraftingUnit_dictText', scopedSlots: { customRender: 'text' } }, { // 主起草单位负责人 title: this.$t('enterpriseStandardLibrary.plan.headOfMainDraftingUnit'), align: 'center', width: 180, - dataIndex: 'mainDraftingUnitResponsiblePerson', + dataIndex: 'mainDraftingUnitResponsiblePerson_dictText', scopedSlots: { customRender: 'text' } }, { // 隶属工作组 title: this.$t('workCenter.revisionPlanActivelyReport.affiliatedWorkingGroup'), align: 'center', width: 180, - dataIndex: 'affiliatedWorkingGroup', + dataIndex: 'workGroup_dictText', scopedSlots: { customRender: 'text' } }, { // 标准推进人 title: this.$t('enterpriseStandardLibrary.plan.standardPusher'), align: 'center', width: 180, - dataIndex: 'standardPromoter', + dataIndex: 'standardPromoter_dictText', scopedSlots: { customRender: 'text' } }, { // 草稿计划完成日期 @@ -261,8 +261,8 @@ export default { selectedRowKeys: [], selectionRows: [], url: { - list: '', - downTemplateUrl: '' + downTemplateUrl: '/process/es/annualReport/templateDownload', + importExcelUrl: '/process/es/annualReport/importExcel' }, modalType: '' // 是在新增还是在编辑,编辑的时候放正在编辑的下标 } @@ -341,7 +341,8 @@ export default { } else { this.$message.success(info.file.response.message || `${info.file.name} 文件上传成功`) } - this.loadData() + this.dataSource = Object.assign([], this.dataSource, info.file.response.result) + // this.dataSource.push(info.file.response.result) } else { this.$message.error(`${info.file.name} ${info.file.response.message}.`) }