From 50482a7ec6bf077174baf477b669a156af4a255c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Wed, 10 May 2023 10:53:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=E6=8F=90=E5=87=BA?=
 =?UTF-8?q?=E7=9A=84=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    | 52 ++++++++++++++++---
 .../components/listOfRegulations.vue          |  1 +
 2 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 1d40ff894..c9b280e65 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -52,6 +52,29 @@
                        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 v-if="toggleSearchStatus">
 
           </template>
@@ -537,7 +560,7 @@
 
   export default {
     name: 'index',
-    props: ['isDisplayNum'],
+    props: ['isDisplayNum','areaOfResponsibility'],
     mixins: [ResizeColumnProvide, ResizeHeader],
     components: {
       globalAdvancedQuery,
@@ -827,16 +850,19 @@
         toDoIds: [],
         toDoNotConditions: [],
         userInfoQuery: {},
-        DeliverableTreeList: []
+        DeliverableTreeList: [],
+        firstLevelDutyTerritoryList:[],
       }
     },
     mounted() {
       // this.getList()
+      this.getFirstLevelDutyTerritory()
       this.long = localStorage.getItem('language') || 'zh-cn'
       this.loading = true
       this.userInfoQuery = this.userInfo()
-      if (this.areaOfResponsibility && this.areaOfResponsibility.dutyTerritory) {
-        this.queryParam.dutyTerritory = this.areaOfResponsibility.dutyTerritory
+      console.log(this.areaOfResponsibility)
+      if (this.areaOfResponsibility && this.areaOfResponsibility.dutyTerritoryName) {
+        this.queryParam.firstLevelDutyTerritory = this.areaOfResponsibility.dutyTerritoryName
         this.queryParam = { ...this.queryParam }
       }
       this.getProcessStatus()
@@ -884,6 +910,15 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
+      getFirstLevelDutyTerritory() {
+        getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+          if (res.success) {
+            this.firstLevelDutyTerritoryList = res.result
+          } else {
+            this.firstLevelDutyTerritoryList = []
+          }
+        })
+      },
       addConfigurationClick() {
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
           this.$refs.addConfigurationRef.getData(JSON.parse(JSON.stringify(this.selectedRowKeys)))
@@ -1045,9 +1080,9 @@
             }
             this.dataSource = res.result.records || []
             this.dataSource.forEach(value => {
-              if (value.flowStatusName =='清单待校核'){
+              if (value.flowStatusName == '清单待校核') {
                 value.flowStatusName = '任务待发起'
-              }else if(value.flowStatusName =='List to be checked'){
+              } else if (value.flowStatusName == 'List to be checked') {
                 value.flowStatusName = 'The task is to be initiated'
               }
             })
@@ -2365,6 +2400,7 @@
   .page {
     text-align: right;
     margin-top: 20px;
+    margin-bottom: 20px;
   }
 
   .operator-text-left {
@@ -2561,10 +2597,12 @@
     background: #dbf6e2;
     color: #26BD4B;
   }
-  .componentColor{
+
+  .componentColor {
     background: #EDFCEF;
     color: #6FD682;
   }
+
   .nonConformityColor {
     background: #f3dddd;
     color: #E83030;
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 01af020ad..b18e61954 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -76,6 +76,7 @@
               <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
                         allowClear
                         show-search
+                        class="box-input"
                         optionFilterProp="label"
                         :getPopupContainer="triggerNode=> triggerNode.parentNode"
                         v-model="queryParam.firstLevelDutyTerritory">