From d557b67f540cbf96f9565d80043ac6fbeccfbf6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Sun, 20 Aug 2023 17:11:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=85=B3=E4=BA=BA?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/listOfRelevantPersonnel.vue    | 76 ++++++++++---------
 1 file changed, 39 insertions(+), 37 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
index 1325e29f6..ec3089a72 100644
--- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
@@ -11,50 +11,38 @@
         <a-row :gutter="24">
           <a-col :md="12" :sm="8">
             <div class="box-title-text-search">
-              <div class="title-text-search" :title="$t('areaOfResponsibility')">
-                <span>{{$t('areaOfResponsibility')}}</span>
+              <div class="title-text-search" :title="$t('statisticalNodes')">
+                <span>{{$t('statisticalNodes')}}</span>
               </div>
-              <j-multi-select-tag class="box-input-search" v-model="queryParam.dutyTerritory"
-                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                 :type="'select'"
-                                 :triggerChange="false" :dictCode="'duty_territory'"/>
-            </div>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :md="12" :sm="8">
-              <div class="box-title-text-search">
-                <div class="title-text-search" :title="$t('statisticalNodes')">
-                  <span>{{$t('statisticalNodes')}}</span>
-                </div>
-                <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
-                          allowClear
-                          show-search
-                          class="box-input-search"
-                          optionFilterProp="label"
-                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          v-model="queryParam.firstLevelDutyTerritory">
-                  <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
-                                   :key="key"
-                                   :label="item.key"
-                                   :value="item.key">
+              <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                        allowClear
+                        show-search
+                        class="box-input-search"
+                        optionFilterProp="label"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        v-model="queryParam.firstLevelDutyTerritory">
+                <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+                                 :key="key"
+                                 :label="item.key"
+                                 :value="item.key">
                                <span style="display: inline-block;width: 100%" :title=" item.key ">
                                      {{ item.key }}
                                </span>
-                  </a-select-option>
-                </a-select>
-              </div>
-            </a-col>
+                </a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+
+          <template v-if="toggleSearchStatus">
             <a-col :md="12" :sm="8">
               <div class="box-title-text-search">
-                <div class="title-text-search" :title="$t('engineeringInterfacePerson')">
-                  <span>{{$t('engineeringInterfacePerson')}}</span>
+                <div class="title-text-search" :title="$t('areaOfResponsibility')">
+                  <span>{{$t('areaOfResponsibility')}}</span>
                 </div>
-                <PersonnelSelection class="box-input-search"
-                                    :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"
-                                    :isInput="true"
-                                    :personneQuery="queryParam"
-                                    @change="PersonnelSelectionChange"
-                                    v-model="queryParam.engineeringInterfacePersonName"/>
+                <j-multi-select-tag class="box-input-search" v-model="queryParam.dutyTerritory"
+                                    :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'duty_territory'"/>
               </div>
             </a-col>
             <a-col :md="12" :sm="8">
@@ -70,6 +58,20 @@
                                     v-model="queryParam.lawEngineerName"/>
               </div>
             </a-col>
+            <a-col :md="12" :sm="8">
+              <div class="box-title-text-search">
+                <div class="title-text-search" :title="$t('engineeringInterfacePerson')">
+                  <span>{{$t('engineeringInterfacePerson')}}</span>
+                </div>
+                <PersonnelSelection class="box-input-search"
+                                    :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"
+                                    :isInput="true"
+                                    :personneQuery="queryParam"
+                                    @change="PersonnelSelectionChange"
+                                    v-model="queryParam.engineeringInterfacePersonName"/>
+              </div>
+            </a-col>
+
 <!--            <a-col :md="12" :sm="8">-->
 <!--              <div class="box-title-text-search">-->
 <!--                <div class="title-text-search" :title="$t('certifiedEngineer')">-->