我的收藏;我的订阅 表格排序问题

jero-web/src/views/documentManage/collection/index.vue

@@ -65,6 +65,7 @@
               :dataSource="tableData"
               :pagination="false"
               :loading="loading"
+              @change="tableOnChange"
               :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             >
                 <span slot="serialNumber" slot-scope="text, record">
@@ -115,6 +116,8 @@
           pageSize: 10
         },  //搜索条件
         total: 0,
+        orderBy: '1',
+        orderByField: '',
         //列表表头
         columns: [
           {
@@ -123,6 +126,7 @@
             key: 'serialNumber',
             scopedSlots: { customRender: 'serialNumber' },
             align: 'center',
+            sorter:true,
             ellipsis: true,
             width: 180
           },
@@ -139,6 +143,7 @@
             align: 'center',
             width: 180,
             ellipsis: true,
+            sorter:true,
             dataIndex: 'state'
           },
           {
@@ -146,6 +151,7 @@
             align: 'center',
             width: 180,
             ellipsis: true,
+            sorter:true,
             dataIndex: 'createTime'
           },
           {
@@ -167,9 +173,22 @@
       this.loadData()
     },
     methods: {
+      tableOnChange(pagination, filters, sorter) {
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        if(sorter.columnKey == 'serialNumber'){
+          this.orderByField = 'serial_number'
+        } else if(sorter.columnKey == 'createTime') {
+          this.orderByField = 'create_time'
+        } else{
+          this.orderByField = sorter.columnKey
+        }
+        this.loadData()
+      },
       //获取列表数据
       loadData() {
         let params = {
+          orderBy: this.orderBy,
+          orderByField: this.orderByField,
           ...this.queryParams
         }
         this.loading = true

jero-web/src/views/documentManage/subscribtion/index.vue

@@ -68,6 +68,7 @@
           :dataSource="tableData"
           :pagination="false"
           :loading="loading"
+          @change="tableOnChange"
           :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         >
           <span slot="serialNumber" slot-scope="text, record">
@@ -114,6 +115,8 @@
           pageSize: 10
         },  //搜索条件
         total: 0,
+        orderBy: '1',
+        orderByField: '',
         //列表表头
         columns: [
           {
@@ -123,6 +126,7 @@
             align: 'center',
             width: 180,
             scopedSlots: { customRender: 'serialNumber' },
+            sorter:true,
             ellipsis: true
           },
           {
@@ -138,6 +142,7 @@
             align: 'center',
             width: 180,
             dataIndex: 'state',
+            sorter:true,
             ellipsis: true
           },
           {
@@ -145,6 +150,7 @@
             align: 'center',
             width: 180,
             dataIndex: 'createTime',
+            sorter:true,
             ellipsis: true
           },
           {
@@ -177,9 +183,22 @@
       this.loadData()
     },
     methods: {
+      tableOnChange(pagination, filters, sorter) {
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        if(sorter.columnKey == 'serialNumber'){
+          this.orderByField = 'serial_number'
+        } else if(sorter.columnKey == 'createTime') {
+          this.orderByField = 'create_time'
+        } else{
+          this.orderByField = sorter.columnKey
+        }
+        this.loadData()
+      },
       //获取列表数据
       loadData() {
         let params = {
+          orderBy: this.orderBy,
+          orderByField: this.orderByField,
           ...this.queryParams
         }
         this.loading = true

jero-web/src/views/parameter/escalationlibrary/index.vue

@@ -39,6 +39,7 @@
         :scroll="{x: '100%',y:'calc(100vh - 158px)'}"
         rowKey="id"
         :data-source="dataSource"
+        @change="tableOnChange"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :columns="columns"
       >
@@ -126,6 +127,8 @@
         paramsManifestId:'',
         selectedRowKeysArray: '',
         formInline: {},
+        orderBy: '1',
+        orderByField: '',
         rules: {
           paramsTemplateName: [
             { required: true, message: this.$t('PleaseEnter') + this.$t('templateName'), trigger: 'change' }
@@ -156,6 +159,7 @@
             align: 'center',
             width: '17%',
             dataIndex: 'projectName',
+            sorter:true,
             scopedSlots: { customRender: 'projectName' }
           },
           {
@@ -304,10 +308,21 @@
         //     }
         // })
       },
+      tableOnChange(pagination, filters, sorter) {
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        if(sorter.columnKey == 'projectName') {
+          this.orderByField = 'pageName'
+        } 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