From 40bf4be6893a50b7eaf21c53f3f4a3a12d4c38dd Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 6 Sep 2023 17:50:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/nonConformance.vue             | 36 +++++++++++++++----
 .../projectNonConformance/index.vue           | 36 +++++++++++++++----
 2 files changed, 60 insertions(+), 12 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue
index 58308d5a9..94c67f20e 100644
--- a/jero-web/src/views/projectManagement/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/components/nonConformance.vue
@@ -59,13 +59,26 @@
             </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 class="title-text" :title="$t('statisticalNodes')">
+                  <span>{{$t('statisticalNodes')}}</span>
                 </div>
-                <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
-                                   :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'duty_territory'"/>
+                <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                          allowClear
+                          show-search
+                          mode="multiple"
+                          class="box-input-search"
+                          optionFilterProp="label"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          v-model="queryParam.dutyTerritory">
+                  <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-col :md="6" :sm="8">
@@ -214,6 +227,7 @@ export default {
       dataSource: [],
       selectedRowKeys: [],
       projectNameList: [],
+      firstLevelDutyTerritoryList:[],
       ProblemstateList:[this.$t('red'),this.$t('yellow'),this.$t('green'),],
       // CertificationColor: {
       //   $t('red'): 'nonConformityColor',
@@ -325,6 +339,7 @@ export default {
     this.long = localStorage.getItem('language') || 'zh-cn'
     this.getList()
     this.getNameList()
+    this.getFirstLevelDutyTerritory()
   },
   watch: {
     '$socketPublic.state.msg': {
@@ -339,6 +354,15 @@ export default {
     }
   },
   methods: {
+    getFirstLevelDutyTerritory() {
+      getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+        if (res.success) {
+          this.firstLevelDutyTerritoryList = res.result
+        } else {
+          this.firstLevelDutyTerritoryList = []
+        }
+      })
+    },
     getNameList() {
       getAction('/project/projectNameInfoEO/queryProjectNameList', {}).then((res) => {
         if (res.success) {
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
index 6d27e7639..c9ca09da6 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
@@ -59,13 +59,26 @@
             </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 class="title-text" :title="$t('statisticalNodes')">
+                  <span>{{$t('statisticalNodes')}}</span>
                 </div>
-                <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
-                                   :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'duty_territory'"/>
+                <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                          allowClear
+                          show-search
+                          mode="multiple"
+                          class="box-input-search"
+                          optionFilterProp="label"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          v-model="queryParam.dutyTerritory">
+                  <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-col :md="6" :sm="8">
@@ -213,6 +226,7 @@
         loading: false,
         dataSource: [],
         selectedRowKeys: [],
+        firstLevelDutyTerritoryList:[],
         projectNameList: [],
         ProblemstateList:[this.$t('red'),this.$t('yellow'),this.$t('green'),],
         // CertificationColor: {
@@ -325,6 +339,7 @@
       this.long = localStorage.getItem('language') || 'zh-cn'
       this.getList()
       this.getNameList()
+      this.getFirstLevelDutyTerritory()
     },
     watch: {
       '$socketPublic.state.msg': {
@@ -339,6 +354,15 @@
       }
     },
     methods: {
+      getFirstLevelDutyTerritory() {
+        getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+          if (res.success) {
+            this.firstLevelDutyTerritoryList = res.result
+          } else {
+            this.firstLevelDutyTerritoryList = []
+          }
+        })
+      },
       getNameList() {
         getAction('/project/projectNameInfoEO/queryProjectNameList', {}).then((res) => {
           if (res.success) {