From e3922c9f23f4747d996da4c3fb7134ee0a6dde5b Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 16 Dec 2022 10:31:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5;=E9=A1=B9=E7=9B=AE=E5=BA=93=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5;=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E5=88=97=E8=A1=A8=E9=A1=B5=20=E8=A1=A8?= =?UTF-8?q?=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 --- .../components/virtualListDetails.vue | 32 +++++++++++++++++++ .../views/documentTools/virtualList/index.vue | 10 ++++++ .../projectLibrary/index.vue | 14 ++++++++ .../projectNonConformance/index.vue | 17 ++++++++++ 4 files changed, 73 insertions(+) diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index aec561e90..4959732c7 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -154,6 +154,7 @@ :scroll="{x: '100%',y:'calc(100vh - 356px)'}" rowKey="id" :data-source="dataSource" + @change="tableOnChange" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > @@ -293,6 +294,8 @@ components: {}, visibleFile: false, transferList: false, + orderBy: '1', + orderByField: '', downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download', dataSourceFile: [], @@ -334,6 +337,7 @@ align: 'center', dataIndex: 'serialNumber', width: 180, + sorter:true, fixed: 'left', scopedSlots: { customRender: 'standard' } }, @@ -364,6 +368,7 @@ align: 'center', width: 180, ellipsis: true, + sorter:true, dataIndex: 'shi4Yong4Fan4Wei2_dictText' }, { @@ -371,6 +376,7 @@ align: 'center', width: 100, ellipsis: true, + sorter:true, dataIndex: 'state_dictText' }, { @@ -392,6 +398,7 @@ align: 'center', width: 200, ellipsis: true, + sorter:true, dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1' }, { @@ -399,6 +406,7 @@ align: 'center', width: 210, ellipsis: true, + sorter:true, dataIndex: 'implementTime' }, { @@ -406,6 +414,7 @@ align: 'center', dataIndex: 'wvtaId', width: 180, + sorter:true, ellipsis: true }, { @@ -420,6 +429,7 @@ align: 'center', width: 200, ellipsis: true, + sorter:true, dataIndex: 'attestationRank_dictText' }, { @@ -441,6 +451,7 @@ align: 'center', width: 180, ellipsis: true, + sorter:true, dataIndex: 'dutyTerritory_dictText' }, { @@ -743,10 +754,31 @@ this.$refs.transferListRef.handleCancel() this.getList() }, + 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') { + this.orderByField = 'dutyTerritory' + } else if(sorter.columnKey == 'attestationRank_dictText') { + this.orderByField = 'attestationRank' + } else{ + this.orderByField = sorter.columnKey + } + this.getList() + }, getList() { let query = { ...this.queryParam, ...this.queryParamQuery, + orderBy: this.orderBy, + orderByField: this.orderByField, dummyInventoryBaseId: this.$route.query.id } this.loading = true diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue index d329acfc3..e211b8033 100644 --- a/jero-web/src/views/documentTools/virtualList/index.vue +++ b/jero-web/src/views/documentTools/virtualList/index.vue @@ -56,6 +56,7 @@ :scroll="{x: '100%'}" rowKey="id" :data-source="dataSource" + @change="tableOnChange" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > @@ -246,6 +247,8 @@ ], queryParam: {}, administrators:false, + orderBy: '1', + orderByField: '' } }, mounted() { @@ -269,6 +272,11 @@ this.selectedRowKeys = [] this.getList() }, + tableOnChange(pagination, filters, sorter) { + this.orderBy = sorter.order == 'ascend' ? '1' : '2' + this.orderByField = sorter.columnKey + this.getList() + }, setCreatorClick() { if (this.selectedRowKeys.length > 0) { let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) @@ -415,6 +423,8 @@ 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/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue index ad55299ec..57feeb8b8 100644 --- a/jero-web/src/views/projectManagement/projectLibrary/index.vue +++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue @@ -120,6 +120,7 @@ :pagination="false" :scroll="{x: '100%'}" rowKey="id" + @change="tableOnChange" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" @@ -203,6 +204,7 @@ align: 'left', dataIndex: 'projectName', width: 180, + sorter:true, ellipsis: true, scopedSlots: { customRender: 'projectName' } }, @@ -224,6 +226,7 @@ title: this.$t('StudioEngineer'), align: 'center', width: 180, + sorter:true, ellipsis: true, dataIndex: 'studioEngineerName' }, @@ -246,6 +249,7 @@ align: 'center', width: 180, ellipsis: true, + sorter:true, dataIndex: 'vehiclePlatform' }, { @@ -253,6 +257,7 @@ align: 'center', width: 180, ellipsis: true, + sorter:true, dataIndex: 'digitalPlatform' }, { @@ -265,6 +270,8 @@ ], userInfoQuery: {}, queryParam: {}, + orderBy: '1', + orderByField: '', administrators: false } }, @@ -396,10 +403,17 @@ this.queryParam[value] = id this.queryParam = { ...this.queryParam } }, + 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, + orderBy: this.orderBy, + orderByField: this.orderByField, ...this.queryParam } this.loading = true diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index 3c58f2543..36c01e653 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -155,6 +155,7 @@ :loading="loading" :pagination="false" :scroll="{x: '100%'}" + @change="tableOnChange" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :data-source="dataSource" :columns="columns" @@ -205,6 +206,7 @@ align: 'center', dataIndex: 'serialNumber', width: 170, + sorter:true, scopedSlots: { customRender: 'standard' } }, { @@ -219,6 +221,7 @@ align: 'center', dataIndex: 'flowType', width: 180, + sorter:true, ellipsis: true }, { @@ -226,6 +229,7 @@ align: 'center', dataIndex: 'dutyTerritory', width: 180, + sorter:true, ellipsis: true }, { @@ -233,6 +237,7 @@ align: 'center', dataIndex: 'projectName', width: 180, + sorter:true, ellipsis: true }, { @@ -240,24 +245,29 @@ align: 'center', dataIndex: 'problemType', width: 140, + sorter:true, ellipsis: true }, { title: this.$t('Sponsor'), align: 'center', dataIndex: 'initiator', + sorter:true, width: 140 }, { title: this.$t('personLiable'), align: 'center', dataIndex: 'duty', + sorter:true, width: 140 } ], total: 0, pageSize: 10, pageNo: 1, + orderBy: '1', + orderByField: '', url: { page: '/project/ncrTrackController/queryPage', exportData: '/project/ncrTrackController/exportData' @@ -333,10 +343,17 @@ this.pageSize = pageSize this.getList() }, + 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, + orderBy: this.orderBy, + orderByField: this.orderByField, ...this.queryParam } this.loading = true