@@ -383,6 +405,7 @@
@@ -391,6 +414,7 @@
@@ -398,6 +422,7 @@
@@ -406,6 +431,7 @@
@@ -414,6 +440,7 @@
@@ -422,6 +449,7 @@
@@ -458,6 +486,7 @@
@@ -466,6 +495,7 @@
@@ -475,12 +505,14 @@
@@ -489,6 +521,7 @@
@@ -497,6 +530,7 @@
@@ -505,6 +539,7 @@
@@ -513,6 +548,7 @@
@@ -521,6 +557,7 @@
@@ -653,6 +690,7 @@
@@ -660,6 +698,7 @@
@@ -684,6 +725,7 @@
@@ -692,6 +734,7 @@
@@ -700,6 +743,7 @@
@@ -707,6 +751,7 @@
diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
index 8e15fb797..f154dc397 100644
--- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
@@ -349,6 +349,7 @@
align: 'left',
dataIndex: 'firstLevelDutyTerritory',
ellipsis: true,
+ sorter:true,
width: 100
},
{
@@ -364,6 +365,7 @@
dataIndex: 'lawEngineerName',
slots: { title: 'regulatoryEngineer' },
ellipsis: true,
+ sorter:true,
width: 153
},
{
@@ -371,6 +373,7 @@
slots: { title: 'engineeringInterfacePerson' },
dataIndex: 'engineeringInterfacePersonName',
ellipsis: true,
+ sorter:true,
width: 153
},
// {
@@ -385,20 +388,23 @@
slots: { title: 'projectInterfacePersonRegulationEngineerSetting' },
dataIndex: 'engineerLawSetName',
ellipsis: true,
- width: 203
+ sorter:true,
+ width: 213
},
{
align: 'left',
slots: { title: 'projectInterfacePersonCertificationEngineerSetting' },
dataIndex: 'engineerAttSetName',
ellipsis: true,
- width: 203
+ sorter:true,
+ width: 213
},
{
title: this.$t('remarks'),
align: 'left',
dataIndex: 'remark',
ellipsis: true,
+ sorter:true,
width: 188
},
{
@@ -520,6 +526,8 @@
administrators: false,
userIds:'',
userName:'',
+ orderBy: '1',
+ orderByField: '',
}
},
computed: {
@@ -606,10 +614,16 @@
},
tableOnChange(pagination, filters, sorter) {
this.orderBy = sorter.order == 'ascend' ? '1' : '2'
- if (sorter.columnKey == 'flowTypeShow') {
- this.orderByField = 'flowType'
- } else if (sorter.columnKey == 'taskDefinitionKeyName') {
- this.orderByField = 'taskDefinitionKey'
+ if (sorter.columnKey == 'dutyTerritory_dictText') {
+ this.orderByField = 'dutyTerritory'
+ } else if (sorter.columnKey == 'lawEngineerName') {
+ this.orderByField = 'lawEngineer'
+ }else if (sorter.columnKey == 'engineeringInterfacePersonName') {
+ this.orderByField = 'engineeringInterfacePerson'
+ }else if (sorter.columnKey == 'engineerLawSetName') {
+ this.orderByField = 'engineerLawSet'
+ } else if (sorter.columnKey == 'engineerAttSetName') {
+ this.orderByField = 'engineerAttSet'
} else {
this.orderByField = sorter.columnKey
}
@@ -738,7 +752,9 @@
getList() {
let query = {
projectId: this.$route.query.id,
- ...this.queryParam
+ ...this.queryParam,
+ orderBy: this.orderBy,
+ orderByField: this.orderByField,
}
this.loading = true
postAction(this.url.page, query).then((res) => {