From 8c0b7bf0c0c9ec82f431d14ae4cc5edb8d4ab6b4 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 23 Dec 2022 10:59:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86;=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9;=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=AF=BC=E5=87=BA=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E8=A1=A8=E6=A0=BC=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parameter/ParameterTemplate/index.vue | 24 +++++++++++++++++++ .../views/parameter/parameterexport/index.vue | 18 ++++++++++++++ .../components/listOfRegulations.vue | 2 ++ .../components/nonConformance.vue | 16 +++++++++++++ 4 files changed, 60 insertions(+) diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index e29fd17b3..7c74713b6 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -56,6 +56,7 @@ rowKey="id" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" + @change="tableOnChange" :columns="columns" > @@ -131,6 +132,8 @@ export default { toggleSearchStatus: false, selectedRowKeys: [], selectedRowKeysArray: '', + orderBy: '1', + orderByField: '', formInline: {}, rules: { paramsTemplateName:[ @@ -159,6 +162,7 @@ export default { align: 'center', width: 160, ellipsis: true, + sorter:true, dataIndex: 'region_dictText', }, { @@ -166,6 +170,7 @@ export default { align: 'center', width: 180, ellipsis: true, + sorter:true, dataIndex: 'paramsTemplateName', scopedSlots: { customRender: 'projectName' } }, @@ -181,6 +186,7 @@ export default { align: 'center', dataIndex: 'createTime', width: 160, + sorter:true, ellipsis: true, }, { @@ -188,6 +194,7 @@ export default { align: 'center', width: 160, ellipsis: true, + sorter:true, dataIndex: 'updateTime' }, { @@ -354,10 +361,27 @@ export default { this.queryParam[value] = id this.queryParam = { ...this.queryParam } }, + tableOnChange(pagination, filters, sorter) { + this.orderBy = sorter.order == 'ascend' ? '1' : '2' + if(sorter.columnKey == 'region_dictText'){ + this.orderByField = 'region' + } else if(sorter.columnKey == 'paramsTemplateName') { + this.orderByField = 'params_template_name' + } else if(sorter.columnKey == 'createTime') { + this.orderByField = 'create_time' + } else if(sorter.columnKey == 'updateTime') { + this.orderByField = 'update_time' + } else{ + this.orderByField = sorter.columnKey + } + this.getList() + }, getList() { let query = { pageNo: this.pageNo, pageSize: this.pageSize, + orderBy: this.orderBy, + orderByField: this.orderByField, ...this.queryParam } this.loading = true diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue index b60c0964e..084dd91ef 100644 --- a/jero-web/src/views/parameter/parameterexport/index.vue +++ b/jero-web/src/views/parameter/parameterexport/index.vue @@ -40,6 +40,7 @@ :scroll="{x: '100%',y:'calc(100vh - 160px)'}" rowKey="id" :data-source="dataSource" + @change="tableOnChange" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > @@ -115,6 +116,8 @@ export default { selectedRowKeys: [], selectedRowKeysArray: '', formInline: {}, + orderBy: '1', + orderByField: '', rules: { paramsTemplateName:[ { required: true, message: this.$t('PleaseEnter')+this.$t('templateName'), trigger: 'change' }, @@ -150,6 +153,7 @@ export default { title: this.$t('templateName'), align: 'center', dataIndex: 'templateName', + sorter:true, ellipsis: true, width: 300, scopedSlots: { customRender: 'templateName' } @@ -181,6 +185,7 @@ export default { align: 'center', width: 180, ellipsis: true, + sorter:true, dataIndex: 'updateTime' }, { @@ -334,10 +339,23 @@ export default { this.queryParam[value] = id this.queryParam = { ...this.queryParam } }, + tableOnChange(pagination, filters, sorter) { + this.orderBy = sorter.order == 'ascend' ? '1' : '2' + if(sorter.columnKey == 'templateName') { + this.orderByField = 'template_name' + } else if(sorter.columnKey == 'updateTime') { + this.orderByField = 'update_time' + } else{ + this.orderByField = sorter.columnKey + } + this.getList() + }, getList() { let query = { pageNo: this.pageNo, pageSize: this.pageSize, + orderBy: this.orderBy, + orderByField: this.orderByField, ...this.queryParam } this.loading = true diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 30745679d..867c015fa 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1511,6 +1511,8 @@ this.orderBy = sorter.order == 'ascend' ? '1' : '2' if(sorter.columnKey == 'attestationRank_dictText'){ this.orderByField = 'attestationRank' + } else if(sorter.columnKey == 'dutyTerritory_dictText'){ + this.orderByField = 'dutyTerritory' } else{ this.orderByField = sorter.columnKey } diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index bac8f1274..55c8390ea 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -56,6 +56,7 @@ :pagination="false" :scroll="{x: '100%'}" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" + @change="tableOnChange" :data-source="dataSource" :columns="columns" > @@ -91,6 +92,8 @@ return { queryParam: {}, loading: false, + orderBy: '1', + orderByField: '', dataSource: [], selectedRowKeys: [], columns: [ @@ -100,6 +103,7 @@ dataIndex: 'serialNumber', scopedSlots: { customRender: 'standard' }, ellipsis: true, + sorter:true, width: 180 }, { @@ -115,6 +119,7 @@ align: 'center', dataIndex: 'flowType', ellipsis: true, + sorter:true, width: 180 }, { @@ -122,6 +127,7 @@ align: 'center', dataIndex: 'dutyTerritory', ellipsis: true, + sorter:true, width: 180 }, { @@ -129,6 +135,7 @@ align: 'center', dataIndex: 'problemType', ellipsis: true, + sorter:true, width: 180 }, { @@ -136,6 +143,7 @@ align: 'center', dataIndex: 'initiator', ellipsis: true, + sorter:true, width: 140 }, { @@ -143,6 +151,7 @@ align: 'center', dataIndex: 'duty', ellipsis: true, + sorter:true, width: 140 } ], @@ -218,11 +227,18 @@ } downloadFilePost(this.url.exportData, this.$t('NonConformance') + '.xls', query, this.Deselect) }, + tableOnChange(pagination, filters, sorter) { + this.orderBy = sorter.order == 'ascend' ? '1' : '2' + this.orderByField = sorter.columnKey + this.getList() + }, getList() { let query = { pageNo: this.pageNo, pageSize: this.pageSize, projectLibraryId: this.$route.query.id, + orderBy: this.orderBy, + orderByField: this.orderByField, ...this.queryParam } this.loading = true