From 3b9467f22b921c904eb2ddf20fa4f596f7a21487 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 6 Apr 2023 15:42:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/common/lang/zh-cn.js | 2 +- .../components/listOfRegulations.vue | 1 - .../components/SentList.vue | 18 ++++++++++++++-- .../components/dealtWith.vue | 21 +++++++++++++++++-- .../components/doneList.vue | 18 ++++++++++++++-- .../projectRegulationTasks/index.vue | 2 +- .../certificationListMaintenance.vue | 21 +++++++++---------- 8 files changed, 64 insertions(+), 21 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 6ae18d7d8..d8b4ef82b 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -601,7 +601,7 @@ module.exports = { selectSplitListDisplay: 'Please select whether to split the document list for display', selectDisplayList: 'Please select whether to display in list', documentSplitDisplay: 'Document splitting module display', - VirtualListName: 'Market List Name', + VirtualListName: 'Market Regulation List Name', CertificationListName:'Certification List Name', listStatus: 'List Status', creater: 'Creater', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 9e1922305..07d07ac47 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -611,7 +611,7 @@ module.exports = { selectSplitListDisplay: '请选择是否文档拆分列表展示', selectDisplayList: '请选择是否列表展示', documentSplitDisplay: '文档拆分模块展示', - VirtualListName: '市场清单名称', + VirtualListName: '市场法规清单名称', CertificationListName:'认证清单名称', VirtualList: '市场清单', listStatus: '清单状态', diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 35f52899d..3f8dd365c 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -645,7 +645,6 @@ align: 'left', dataIndex: 'title', width: 180, - fixed: 'left', scopedSlots: { customRender: 'titleName' } }, { diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index c1c5293f3..fc450034b 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -8,6 +8,7 @@ :pagination="false" :scroll="{x: '100%',y:'calc(100vh - 140px)'}" rowKey="id" + @change="tableOnChange" :data-source="dataSource" :columns="columns" > @@ -65,7 +66,7 @@ dataIndex: 'projectName', scopedSlots: { customRender: 'RelatedItems' }, ellipsis: true, - width: 392 + width: 300 }, { title: this.$t('standardInformation'), @@ -73,7 +74,7 @@ dataIndex: 'standardInfo', scopedSlots: { customRender: 'standardInformation' }, ellipsis: true, - width: 353 + width: 300 }, { title: this.$t('taskType'), @@ -343,6 +344,17 @@ this.pageSize = pageSize this.getList() }, + tableOnChange(pagination, filters, sorter) { + this.orderBy = sorter.order == 'ascend' ? '1' : '2' + if (sorter.columnKey == 'flowTypeShow') { + this.orderByField = 'flowType' + } else if (sorter.columnKey == 'taskDefinitionKeyName') { + this.orderByField = 'taskDefinitionKey' + } else { + this.orderByField = sorter.columnKey + } + this.getList() + }, getList() { let queryParam = JSON.parse(JSON.stringify(this.queryParam)) Object.keys(queryParam).forEach(val => { @@ -353,6 +365,8 @@ let query = { pageNo: this.pageNo, pageSize: this.pageSize, + orderBy: this.orderBy, + orderByField: this.orderByField, ...queryParam } this.loading = true diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 1abb6b6b9..ec2664592 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -10,6 +10,7 @@ :rowKey="(record)=>JSON.stringify(record)" :data-source="dataSource" :columns="columns" + @change="tableOnChange" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" > @@ -78,7 +79,7 @@ dataIndex: 'projectName', ellipsis: true, scopedSlots: { customRender: 'RelatedItems' }, - width: 339 + width: 300 }, { title: this.$t('standardInformation'), @@ -86,13 +87,14 @@ dataIndex: 'standardInfo', ellipsis: true, scopedSlots: { customRender: 'standardInformation' }, - width: 265 + width: 300 }, { title: this.$t('taskType'), align: 'left', dataIndex: 'flowTypeShow', ellipsis: true, + sorter: true, width: 183 }, { @@ -100,6 +102,7 @@ align: 'left', dataIndex: 'taskDefinitionKeyName', ellipsis: true, + sorter: true, width: 183 }, { @@ -122,6 +125,7 @@ dataIndex: 'endTime', ellipsis: true, width: 172, + sorter: true, scopedSlots: { customRender: 'endTime' } }, // { @@ -417,6 +421,17 @@ this.pageSize = pageSize this.getList() }, + tableOnChange(pagination, filters, sorter) { + this.orderBy = sorter.order == 'ascend' ? '1' : '2' + if (sorter.columnKey == 'flowTypeShow') { + this.orderByField = 'flowType' + } else if (sorter.columnKey == 'taskDefinitionKeyName') { + this.orderByField = 'taskDefinitionKey' + } else { + this.orderByField = sorter.columnKey + } + this.getList() + }, getList() { let queryParam = JSON.parse(JSON.stringify(this.queryParam)) Object.keys(queryParam).forEach(val => { @@ -427,6 +442,8 @@ let query = { pageNo: this.pageNo, pageSize: this.pageSize, + orderBy: this.orderBy, + orderByField: this.orderByField, ...queryParam } this.loading = true diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index 43dedbe51..77d4b7e8b 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -8,6 +8,7 @@ :pagination="false" :scroll="{x: '100%',y:'calc(100vh - 140px)'}" rowKey="id" + @change="tableOnChange" :data-source="dataSource" :columns="columns" > @@ -71,7 +72,7 @@ dataIndex: 'projectName', ellipsis: true, scopedSlots: { customRender: 'RelatedItems' }, - width: 392 + width: 300 }, { title: this.$t('standardInformation'), @@ -79,7 +80,7 @@ dataIndex: 'standardInfo', ellipsis: true, scopedSlots: { customRender: 'standardInformation' }, - width: 353 + width: 300 }, { title: this.$t('taskType'), @@ -337,6 +338,17 @@ this.pageSize = pageSize this.getList() }, + tableOnChange(pagination, filters, sorter) { + this.orderBy = sorter.order == 'ascend' ? '1' : '2' + if (sorter.columnKey == 'flowTypeShow') { + this.orderByField = 'flowType' + } else if (sorter.columnKey == 'taskDefinitionKeyName') { + this.orderByField = 'taskDefinitionKey' + } else { + this.orderByField = sorter.columnKey + } + this.getList() + }, getList() { let queryParam = JSON.parse(JSON.stringify(this.queryParam)) Object.keys(queryParam).forEach(val => { @@ -347,6 +359,8 @@ let query = { pageNo: this.pageNo, pageSize: this.pageSize, + orderBy: this.orderBy, + orderByField: this.orderByField, ...queryParam } this.loading = true diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue index 43f97efa6..f0d1ab5ce 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue @@ -76,7 +76,7 @@ -
diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index 5485bc10a..5f3e5a4c3 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -304,6 +304,7 @@ align: 'left', dataIndex: 'category', width: 200, + sorter: true, // fixed: 'left', ellipsis: true }, @@ -313,12 +314,14 @@ dataIndex: 'inspectionItem', width: 200, ellipsis: true, + sorter: true, // fixed: 'left', scopedSlots: { customRender: 'inspectionItems' } }, { title: this.$t('configurationItem'), align: 'left', + sorter: true, dataIndex: 'configItem', width: 200, ellipsis: true @@ -326,6 +329,7 @@ { title: 'WVTA ID', align: 'left', + sorter: true, dataIndex: 'wvtaId', width: 200, ellipsis: true @@ -335,6 +339,7 @@ align: 'left', dataIndex: 'serialNumber', width: 210, + sorter: true, ellipsis: true }, { @@ -342,11 +347,13 @@ align: 'left', dataIndex: 'dutyTerritoryName', width: 200, + sorter: true, ellipsis: true }, { title: this.$t('typeOfDeliverables'), align: 'left', + sorter: true, dataIndex: 'deliverableTypeName', width: 330, ellipsis: true @@ -500,18 +507,10 @@ }, tableOnChange(pagination, filters, sorter) { this.orderBy = sorter.order == 'ascend' ? '1' : '2' - if (sorter.columnKey == 'shi4Yong4Fan4Wei2_dictText') { - this.orderByField = 'shi4Yong4Fan4Wei2' - } else if (sorter.columnKey == 'state_dictText') { - this.orderByField = 'state' - } else if (sorter.columnKey == 'xin1Che1Xing2Shi2Shi1Ri4Qi1') { - this.orderByField = 'xin1_che1_xing2_shi2_shi1_ri4_qi1' - } else if (sorter.columnKey == 'implementTime') { - this.orderByField = 'implement_time' - } else if (sorter.columnKey == 'dutyTerritory_dictText') { + if (sorter.columnKey == 'dutyTerritoryName') { this.orderByField = 'dutyTerritory' - } else if (sorter.columnKey == 'attestationRank_dictText') { - this.orderByField = 'attestationRank' + } else if (sorter.columnKey == 'deliverableTypeName') { + this.orderByField = 'deliverableType' } else { this.orderByField = sorter.columnKey }