合并分支 'fix_2nd_20230103' 到 'master'

Fix 2nd 20230103 查看合并请求 laws-nio/laws-weilai!285
2023-02-11 22:11:08 +08:00
parent 4424ee1540 7e7703b8b3
commit 5d5034491e
12 changed files with 161 additions and 24 deletions
@@ -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 = {