From 16ea118d88fda00805e39109fd43145790fb09ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Fri, 1 Sep 2023 17:30:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/certificationList/index.vue    | 69 ++++++++++---------
 .../components/rxswinModel.vue                |  1 -
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 62c423b60..9ea6add73 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -12,17 +12,6 @@
                        v-model="queryParam.inspectionItem"></j-input>
             </div>
           </a-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('areaOfResponsibility')">
-                <span>{{ $t('areaOfResponsibility') }}</span>
-              </div>
-              <j-multi-select-tag class="box-input" v-model="queryParam.dutyTerritory"
-                                  :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                  :type="'select'"
-                                  :triggerChange="false" :dictCode="'duty_territory'"/>
-            </div>
-          </a-col>
           <a-col :md="6" :sm="8">
             <div class="box-title-text">
               <div class="title-text" :title="$t('ProcessStatus')">
@@ -44,7 +33,41 @@
               </a-select>
             </div>
           </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('statisticalNodes')">
+                <span>{{ $t('statisticalNodes') }}</span>
+              </div>
+              <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                        allowClear
+                        class="box-input"
+                        show-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>
           <template v-if="toggleSearchStatus">
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('areaOfResponsibility')">
+                  <span>{{ $t('areaOfResponsibility') }}</span>
+                </div>
+                <j-multi-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+                                    :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'duty_territory'"/>
+              </div>
+            </a-col>
             <a-col :md="6" :sm="8">
               <div class="box-title-text">
                 <div class="title-text" :title="$t('standardNo')">
@@ -54,29 +77,7 @@
                          v-model="queryParam.serialNumber"></j-input>
               </div>
             </a-col>
-            <a-col :md="6" :sm="8">
-              <div class="box-title-text">
-                <div class="title-text" :title="$t('statisticalNodes')">
-                  <span>{{ $t('statisticalNodes') }}</span>
-                </div>
-                <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
-                          allowClear
-                          class="box-input"
-                          show-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>
+
           </template>
           <span style="float: right;overflow: hidden;margin-right: 11px; " class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
diff --git a/jero-web/src/views/projectManagement/components/rxswinModel.vue b/jero-web/src/views/projectManagement/components/rxswinModel.vue
index 3d81677fc..6b27c2f8e 100644
--- a/jero-web/src/views/projectManagement/components/rxswinModel.vue
+++ b/jero-web/src/views/projectManagement/components/rxswinModel.vue
@@ -295,7 +295,6 @@
             title: this.$t('operation'),
             align: 'left',
             width: 110,
-            fixed: 'right',
             scopedSlots: { customRender: 'operation' }
           }
         ],