合并分支 'fix_2nd_20230103' 到 'master'

Fix 2nd 20230103

查看合并请求 laws-nio/laws-weilai!285

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,18 @@
       cancleoperationFailed() {
         this.selectedRowKeys = []
       },
+      tableOnChange(pagination, filters, sorter) {
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        if(sorter.columnKey == 'nioNumber'){
+          sorter.columnKey = 'nio_number'
+        }else if (sorter.columnKey == 'dutyTerritory'){
+          sorter.columnKey = 'duty_territory'
+        }else if (sorter.columnKey == 'reportTime'){
+          sorter.columnKey = 'report_time'
+        }
+        this.orderByField = sorter.columnKey
+        this.getTableList()
+      },
       getTableList(currentPersonRole) {
         let paramsManifestid
         let url
@@ -935,6 +944,8 @@
           pageSize: this.pageSize,
           userTypes: this.currentPersonRole || currentPersonRole,
           paramsManifestId: paramsManifestid,
+          orderBy: this.orderBy,
+          orderByField: this.orderByField,
           ...this.formInline,
           ...currentPersonRole,
           ...this.queryParamQuery

jero-web/src/components/tableCollection/index1.vue

@@ -636,7 +636,14 @@
         })
       },
       tableOnChange(pagination, filters, sorter) {
-        console.log(pagination, filters, sorter, 'iiiiiiiiiiiiiiiii')
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        if(sorter.columnKey == 'nioNumber'){
+          sorter.columnKey = 'nio_number'
+        }else if (sorter.columnKey == 'syncTime'){
+          sorter.columnKey = 'sync_time'
+        }
+        this.orderByField = sorter.columnKey
+        this.getTableList()
       },
       getTableListReset() {
         let params = {
@@ -709,6 +716,8 @@
         let params = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
+          orderBy: this.orderBy,
+          orderByField: this.orderByField,
           userTypes: this.currentPersonRole || currentPersonRole,
           paramsManifestId: paramsManifestid,
           ...this.formInline

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,15 @@ export default {
     },
     handleTableChange(pagination, filters, sorter) {
       let _i = sorter.order === 'descend' ? 'asc': 'desc'
+      if(sorter.columnKey == 'dutyTerritory_dictText'){
+        sorter.columnKey = 'duty_territory'
+      } else if(sorter.columnKey == 'createTime'){
+        sorter.columnKey = 'create_time'
+      } else if(sorter.columnKey == 'nioNumber'){
+        sorter.columnKey = 'nio_number'
+      }
       let _tt = {
-        orderByField: 'nioNumber',
+        orderByField: sorter.columnKey,
         orderBy: _i
       }
       this.queryParam = {