From 3666038b2a37553c363c3662d21ac5015d151a93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 20 Oct 2023 13:56:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=20=20?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98=E5=90=8D=E5=8D=95=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/listOfRelevantPersonnel.vue    | 89 ++++++++++---------
 1 file changed, 45 insertions(+), 44 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
index ec3089a72..b87256831 100644
--- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
@@ -72,24 +72,24 @@
               </div>
             </a-col>
 
-<!--            <a-col :md="12" :sm="8">-->
-<!--              <div class="box-title-text-search">-->
-<!--                <div class="title-text-search" :title="$t('certifiedEngineer')">-->
-<!--                  <span>{{$t('certifiedEngineer')}}</span>-->
-<!--                </div>-->
-<!--                <a-select class="box-input-search"-->
-<!--                          v-model="queryParam.certificationEngineer"-->
-<!--                          :placeholder="$t('PleaseSelect')+$t('certifiedEngineer')">-->
-<!--                  <a-select-option v-for="(item, key) in dictOptionsValue"-->
-<!--                                   :key="item.certificationEngineer"-->
-<!--                                   :value="item.certificationEngineer">-->
-<!--                      <span class="itemOption" :title=" item.certificationEngineerName ">-->
-<!--                             {{ item.certificationEngineerName }}-->
-<!--                      </span>-->
-<!--                  </a-select-option>-->
-<!--                </a-select>-->
-<!--              </div>-->
-<!--            </a-col>-->
+            <!--            <a-col :md="12" :sm="8">-->
+            <!--              <div class="box-title-text-search">-->
+            <!--                <div class="title-text-search" :title="$t('certifiedEngineer')">-->
+            <!--                  <span>{{$t('certifiedEngineer')}}</span>-->
+            <!--                </div>-->
+            <!--                <a-select class="box-input-search"-->
+            <!--                          v-model="queryParam.certificationEngineer"-->
+            <!--                          :placeholder="$t('PleaseSelect')+$t('certifiedEngineer')">-->
+            <!--                  <a-select-option v-for="(item, key) in dictOptionsValue"-->
+            <!--                                   :key="item.certificationEngineer"-->
+            <!--                                   :value="item.certificationEngineer">-->
+            <!--                      <span class="itemOption" :title=" item.certificationEngineerName ">-->
+            <!--                             {{ item.certificationEngineerName }}-->
+            <!--                      </span>-->
+            <!--                  </a-select-option>-->
+            <!--                </a-select>-->
+            <!--              </div>-->
+            <!--            </a-col>-->
           </template>
           <span style="float: right;overflow: hidden;margin-right: 11px;margin-bottom: 20px"
                 class="table-page-search-submitButtons">
@@ -165,9 +165,9 @@
               :title="$t('projectInterfacePersonCertificationEngineerSetting')">
             {{$t('projectInterfacePersonCertificationEngineerSetting')}}
         </span>
-        <span slot="certifiedEngineer" :title="$t('certifiedEngineer')">
-            {{$t('certifiedEngineer')}}
-        </span>
+        <!--        <span slot="certifiedEngineer" :title="$t('certifiedEngineer')">-->
+        <!--            {{$t('certifiedEngineer')}}-->
+        <!--        </span>-->
       </a-table>
       <!--      <div class="page">-->
       <!--        <a-pagination-->
@@ -363,7 +363,7 @@
     data() {
       return {
         toggleSearchStatus: false,
-        firstLevelDutyTerritoryList:[],
+        firstLevelDutyTerritoryList: [],
         visible: false,
         queryParam: {},
         selectVisible: false,
@@ -375,7 +375,7 @@
             align: 'left',
             dataIndex: 'firstLevelDutyTerritory',
             ellipsis: true,
-            sorter:true,
+            sorter: true,
             width: 100
           },
           {
@@ -383,23 +383,23 @@
             align: 'left',
             dataIndex: 'dutyTerritory_dictText',
             ellipsis: true,
-            sorter:true,
+            sorter: true,
             width: 100
           },
           {
             align: 'left',
             dataIndex: 'lawEngineerName',
-            slots: { title: 'regulatoryEngineer' },
+            scopedSlots: { title: 'regulatoryEngineer' },
             ellipsis: true,
-            sorter:true,
+            sorter: true,
             width: 153
           },
           {
             align: 'left',
-            slots: { title: 'engineeringInterfacePerson' },
+            scopedSlots: { title: 'engineeringInterfacePerson' },
             dataIndex: 'engineeringInterfacePersonName',
             ellipsis: true,
-            sorter:true,
+            sorter: true,
             width: 153
           },
           // {
@@ -411,18 +411,18 @@
           // },
           {
             align: 'left',
-            slots: { title: 'projectInterfacePersonRegulationEngineerSetting' },
+            scopedSlots: { title: 'projectInterfacePersonRegulationEngineerSetting' },
             dataIndex: 'engineerLawSetName',
             ellipsis: true,
-            sorter:true,
+            sorter: true,
             width: 213
           },
           {
             align: 'left',
-            slots: { title: 'projectInterfacePersonCertificationEngineerSetting' },
+            scopedSlots: { title: 'projectInterfacePersonCertificationEngineerSetting' },
             dataIndex: 'engineerAttSetName',
             ellipsis: true,
-            sorter:true,
+            sorter: true,
             width: 213
           },
           {
@@ -430,7 +430,7 @@
             align: 'left',
             dataIndex: 'remark',
             ellipsis: true,
-            sorter:true,
+            sorter: true,
             width: 188
           },
           {
@@ -471,11 +471,11 @@
             align: 'left',
             dataIndex: 'replacementPerson',
             width: 180,
-            scopedSlots: {customRender: 'replacementPerson'}
+            scopedSlots: { customRender: 'replacementPerson' }
           }
         ],
         dataSource: [],
-        selectDataSource:[],
+        selectDataSource: [],
         loading: false,
         editVisible: false,
         confirmLoading: false,
@@ -550,10 +550,10 @@
         selectedRowKeys: [],
         dictOptionsValue: [],
         administrators: false,
-        userIds:'',
-        userName:'',
+        userIds: '',
+        userName: '',
         orderBy: '1',
-        orderByField: '',
+        orderByField: ''
       }
     },
     computed: {
@@ -594,14 +594,14 @@
           }
         })
       },
-      PersonnelSelectionOneChange(value, id, index){
+      PersonnelSelectionOneChange(value, id, index) {
         this.selectDataSource[index][value] = id
         this.selectDataSource = [...this.selectDataSource]
       },
-      selecthandleCancel(){
+      selecthandleCancel() {
         this.selectVisible = false
       },
-      selecthandleSubmit(){
+      selecthandleSubmit() {
         if (this.selectDataSource.length > 0) {
           let replacementUserList = []
           this.selectDataSource.forEach(res => {
@@ -648,14 +648,15 @@
         this.getUserAllDutyTerritoryList()
       },
       tableOnChange(pagination, filters, sorter) {
+        console.log(sorter)
         this.orderBy = sorter.order == 'ascend' ? '1' : '2'
         if (sorter.columnKey == 'dutyTerritory_dictText') {
           this.orderByField = 'dutyTerritory'
         } else if (sorter.columnKey == 'lawEngineerName') {
           this.orderByField = 'lawEngineer'
-        }else if (sorter.columnKey == 'engineeringInterfacePersonName') {
+        } else if (sorter.columnKey == 'engineeringInterfacePersonName') {
           this.orderByField = 'engineeringInterfacePerson'
-        }else if (sorter.columnKey == 'engineerLawSetName') {
+        } else if (sorter.columnKey == 'engineerLawSetName') {
           this.orderByField = 'engineerLawSet'
         } else if (sorter.columnKey == 'engineerAttSetName') {
           this.orderByField = 'engineerAttSet'
@@ -790,7 +791,7 @@
           projectId: this.$route.query.id,
           ...this.queryParam,
           orderBy: this.orderBy,
-          orderByField: this.orderByField,
+          orderByField: this.orderByField
         }
         this.loading = true
         postAction(this.url.page, query).then((res) => {