Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period

jero-web/src/views/projectManagement/components/TaskParameterCollection.vue

@@ -163,6 +163,7 @@
             align: 'center',
             width: 80,
             ellipsis: true,
+            sorter:true,
             dataIndex: 'state'
           },
           {
@@ -177,6 +178,7 @@
             align: 'center',
             width: 120,
             ellipsis: true,
+            sorter:true,
             dataIndex: 'projectVersion'
           },
           {
@@ -185,6 +187,7 @@
             dataIndex: 'finishTime',
             width: 180,
             ellipsis: true,
+            sorter:true,
             scopedSlots: { customRender: 'collectionCompletionTime' }
           },
           {
@@ -192,6 +195,7 @@
             align: 'center',
             width: 80,
             ellipsis: true,
+            sorter:true,
             dataIndex: 'version'
           },
           {
@@ -206,6 +210,7 @@
             align: 'center',
             width: 160,
             ellipsis: true,
+            sorter:true,
             dataIndex: 'createTime'
           },
           {
@@ -219,6 +224,8 @@
         token: Vue.ls.get(ACCESS_TOKEN),
         selectedRowKeys: [],
         queryParam: {},
+        orderBy: '1',
+        orderByField: '',
         url: {
           list: 'params/manifest/page',
           add: 'params/manifest/add',
@@ -312,9 +319,6 @@
         } else {
           this.$message.warning(this.$t('thisbuttonCompleted'))
         }
-      },
-      handleTableChange() {
-
       },
       // 历史版本
       historicalVersion(historicalRow) {
@@ -432,12 +436,27 @@
         this.pageSize = pageSize
         this.getlist()
       },
+      handleTableChange(pagination, filters, sorter) {
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        if(sorter.columnKey == 'projectVersion'){
+          this.orderByField = 'project_version'
+        } else if(sorter.columnKey == 'finishTime') {
+          this.orderByField = 'finish_time'
+        } else if(sorter.columnKey == 'createTime') {
+          this.orderByField = 'create_time'
+        } else{
+          this.orderByField = sorter.columnKey
+        }
+        this.getlist()
+      },
       getlist() {
         this.selectedRowKeys = []
         let query = {
           projectId: this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id,
           pageSize: this.pageSize,
           pageNo: this.pageNo,
+          orderBy: this.orderBy,
+          orderByField: this.orderByField,
           ...this.queryParam
         }
         this.loading = true