diff --git a/src/views/dashboard/modules/SearchAndWarningCard.vue b/src/views/dashboard/modules/SearchAndWarningCard.vue index 0902f52..8fe1108 100644 --- a/src/views/dashboard/modules/SearchAndWarningCard.vue +++ b/src/views/dashboard/modules/SearchAndWarningCard.vue @@ -92,7 +92,7 @@ export default { warningTab: '', // 预警当前tab loading: false, columns: [ - { // 标准编号 + { // 标准编号(跳外标或判断) title: this.$t('standardNumber'), align: 'left', dataIndex: 'standardNumber', @@ -101,13 +101,12 @@ export default { show: () => { return [ this.tabList[0].key, - this.tabList[2].key, this.tabList[3].key, this.tabList[4].key ].includes(this.warningTab) } }, - { // 标准名称 + { // 标准名称(跳外标或判断) title: this.$t('standardName'), align: 'left', dataIndex: 'standardName', @@ -116,12 +115,35 @@ export default { show: () => { return [ this.tabList[0].key, - this.tabList[2].key, this.tabList[3].key, this.tabList[4].key ].includes(this.warningTab) } }, + { // 标准编号(跳企标) + title: this.$t('standardNumber'), + align: 'left', + dataIndex: 'standardNumber', + width: 120, + scopedSlots: { customRender: 'enStandard' }, + show: () => { + return [ + this.tabList[2].key + ].includes(this.warningTab) + } + }, + { // 标准名称(跳企标) + title: this.$t('standardName'), + align: 'left', + dataIndex: 'standardName', + width: 180, + scopedSlots: { customRender: 'enStandard' }, + show: () => { + return [ + this.tabList[2].key + ].includes(this.warningTab) + } + }, { // 解读信息 title: this.$t('dashboard.tableList.interpretationInfo'), align: 'left', @@ -347,22 +369,27 @@ export default { detailClick (record) { let path // 根据来源跳转不同的详情页 - switch (record.source + '') { - // 外来标准 - case StandardSource.FOREIGN.value: - path = '/standardRegulationLibrary/foreignStandardDetailPage' - break - // 企标 - case StandardSource.ENTERPRISE.value: - path = '/enterpriseStandardLibrary/enterpriseStandardDetail' - break - default: - break + if (record.source) { + switch (record.source + '') { + // 外来标准 + case StandardSource.FOREIGN.value: + path = '/standardRegulationLibrary/foreignStandardDetailPage' + break + // 企标 + case StandardSource.ENTERPRISE.value: + path = '/enterpriseStandardLibrary/enterpriseStandardDetail' + break + default: + break + } + } else { + // 没有来源就是外标 + path = '/standardRegulationLibrary/foreignStandardDetailPage' } this.$openPageNewSheet({ path, query: { - id: record.id + id: record.standardId || record.id } }) },