From 5e13324acea7a2fbbd8709396393904ab3711a51 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 9 Feb 2023 11:22:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E9=9B=86=E6=B8=85=E5=8D=95=20?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=20=E6=A8=A1=E6=9D=BF=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=20=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/components/tableCollection/index.vue    | 12 ++++++++----
 jero-web/src/components/tableCollection/index1.vue   |  6 +++++-
 jero-web/src/views/parameter/parameterlist/index.vue |  7 ++++++-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 8dafa8e93..6ab33f434 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -10,10 +10,10 @@
         :scroll="{x: '100%',y:'calc(100vh - 330px)'}"
         :data-source="dataSource"
         :loading="loading"
+        @change="tableOnChange"
         sticky
         :columns="columns"
         :rowClassName="rowClassName"
-        @change="tableOnChange"
         @onHeaderRow='onHeaderRow'
       >
         <span slot="titleName" slot-scope="text,record" :title="text">
@@ -840,9 +840,6 @@
           }
         })
       },
-      tableOnChange(pagination, filters, sorter) {
-        console.log(pagination, filters, sorter, 'iiiiiiiiiiiiiiiii')
-      },
       getTableListReset() {
         this.formInline = {}
         this.queryParamQuery = {}
@@ -915,6 +912,11 @@
       cancleoperationFailed() {
         this.selectedRowKeys = []
       },
+      tableOnChange(pagination, filters, sorter) {
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        this.orderByField = sorter.columnKey
+        this.getTableList()
+      },
       getTableList(currentPersonRole) {
         let paramsManifestid
         let url
@@ -935,6 +937,8 @@
           pageSize: this.pageSize,
           userTypes: this.currentPersonRole || currentPersonRole,
           paramsManifestId: paramsManifestid,
+          orderBy: this.orderBy,
+          orderByField: this.orderByField,
           ...this.formInline,
           ...currentPersonRole,
           ...this.queryParamQuery
diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue
index 709235e41..a8601e137 100644
--- a/jero-web/src/components/tableCollection/index1.vue
+++ b/jero-web/src/components/tableCollection/index1.vue
@@ -636,7 +636,9 @@
         })
       },
       tableOnChange(pagination, filters, sorter) {
-        console.log(pagination, filters, sorter, 'iiiiiiiiiiiiiiiii')
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        this.orderByField = sorter.columnKey
+        this.getTableList()
       },
       getTableListReset() {
         let params = {
@@ -709,6 +711,8 @@
         let params = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
+          orderBy: this.orderBy,
+          orderByField: this.orderByField,
           userTypes: this.currentPersonRole || currentPersonRole,
           paramsManifestId: paramsManifestid,
           ...this.formInline
diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue
index 107c37879..7e62e712a 100644
--- a/jero-web/src/views/parameter/parameterlist/index.vue
+++ b/jero-web/src/views/parameter/parameterlist/index.vue
@@ -181,12 +181,14 @@ export default {
           align: 'left',
           dataIndex: 'dutyTerritory_dictText',
           width: 150,
+          sorter: true,
           ellipsis: true,
         },
         {
           title: this.$t('created'),
           align: 'left',
           dataIndex: 'createTime',
+          sorter: true,
           width: 180,
           ellipsis: true,
         },
@@ -210,8 +212,11 @@ export default {
     },
     handleTableChange(pagination, filters, sorter) {
       let _i = sorter.order === 'descend' ? 'asc': 'desc'
+      if(sorter.columnKey == 'dutyTerritory_dictText'){
+        sorter.columnKey = 'dutyTerritory'
+      }
       let _tt = {
-        orderByField: 'nioNumber',
+        orderByField: sorter.columnKey,
         orderBy: _i
       }
       this.queryParam = {