diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 20406cdaf..bcb95b0a8 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -547,7 +547,23 @@ }, tableOnChange(pagination, filters, sorter) { this.orderBy = sorter.order == 'ascend' ? '1' : '2' - this.orderByField = sorter.columnKey + if(sorter.columnKey == 'standard'){ + this.orderByField = 'serialNumber' + } else if(sorter.columnKey == 'areaOfResponsibility') { + this.orderByField = 'dutyTerritory' + } else if(sorter.columnKey == 'confirmationOfDesignConformity') { + this.orderByField = 'designFlowTaskStatus' + } else if(sorter.columnKey == 'PrehomoConfirmation') { + this.orderByField = 'prehomoFlowTaskStatus' + } else if(sorter.columnKey == 'verificationAndConformityconfirmation') { + this.orderByField = 'verifyFlowTaskStatus' + } else if(sorter.columnKey == 'CertificationProgress') { + this.orderByField = 'certificationProgressName' + } else if(sorter.columnKey == 'CurrentProjectStatusEvaluation') { + this.orderByField = 'projectStatusAssess' + } else{ + this.orderByField = sorter.columnKey + } this.getList() }, getList() { diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index cc4d87d93..6a6c566d8 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/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) { @@ -431,11 +435,26 @@ 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() { 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