From 95039fd56d4df19870b4ee0926b1d99a7345280b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= Date: Wed, 27 Sep 2023 10:51:49 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=9B=BD=E5=86=85=E3=80=81=E6=B5=B7?= =?UTF-8?q?=E5=A4=96=E6=A0=87=E5=87=86=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mixins/ConfigurableTableMixin.js | 3 +++ .../domesticStandard/DomesticStandardList.vue | 2 +- .../overseasStandard/OverseasStandardList.vue | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/mixins/ConfigurableTableMixin.js b/src/mixins/ConfigurableTableMixin.js index 560f1c1f..e67c0fd6 100644 --- a/src/mixins/ConfigurableTableMixin.js +++ b/src/mixins/ConfigurableTableMixin.js @@ -212,6 +212,9 @@ export const ConfigurableTableMixin = { } else { sortFieldName = sorter.columnKey } + if (!sorter.order) { + sortFieldName = '' + } this.orderByField = sortFieldName this.ipagination = pagination this.loadData() diff --git a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue index 3b34af54..991ffc47 100644 --- a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue +++ b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue @@ -248,7 +248,7 @@ export default { downTemplateUrl: '/laws/standard/domestic/templateDownload', // 下载模板 exportXlsUrl: '/laws/standard/domestic/exportData', // 导出 exportZipUrl: '/laws/standard/domestic/exportDataWithFile', // 带文件导出 - importExcelUrl: '' // 导入 + importExcelUrl: '/laws/standard/domestic/importExcelWithData' // 导入 }, yesValue: YesOrNoEnum.YES.value, noValue: YesOrNoEnum.NO.value, diff --git a/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue b/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue index 8ed3869e..e7570d3c 100644 --- a/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue +++ b/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue @@ -249,7 +249,7 @@ export default { downTemplateUrl: '/laws/standard/overseas/templateDownload', // 下载模板 exportXlsUrl: '/laws/standard/overseas/exportData', // 导出 exportZipUrl: '/laws/standard/overseas/exportDataWithFile', // 带文件导出 - importExcelUrl: '' // 导入 + importExcelUrl: '/laws/standard/overseas/importExcelWithData' // 导入 }, yesValue: YesOrNoEnum.YES.value, noValue: YesOrNoEnum.NO.value,