From 8029354f9c7efeb89ccd58804216052201ba1954 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 19 Aug 2021 16:22:46 +0800
Subject: [PATCH] =?UTF-8?q?=20=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E6=95=B0=E6=8D=AE=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/listOfCountries.vue                  | 20 +++++++++++++++++++
 .../page/listOther.vue                        |  3 +++
 .../page/listProject.vue                      |  4 ++++
 3 files changed, 27 insertions(+)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index c4cfc9b43..5593b545e 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -66,6 +66,7 @@
       </el-button>
     </div>
     <div class="container">
+      <loading :loading="tableLoading">数据获取中</loading>
       <el-table
         :data="sarAccessListDatas"
         tooltip-effect="dark"
@@ -220,6 +221,7 @@ export default {
         { value: "FOREIGN_LAWS", label: "国内外政策" },
         { value: "BUSINESS", label: "企业标准 " }
       ],
+      tableLoading: true,
       sarAccessInfoSearchList: [],
       selectedAccInfoSearchList: [],
       sarAccessInfoListArry: [],
@@ -259,8 +261,23 @@ export default {
         _this: this
       }, res => {
         this.sarAccessListDatas = res.data.records
+        this.sarAccessListDatas.forEach(item => {
+          // 国家地区转换
+          if (item.countryArea !== null || item.countryArea !== "") {
+            let k = (item.countryArea || "").split(',')
+            for (let i in this.countryOptions) {
+              for (let m = 0; m< k.length; m++) {
+                if (this.countryOptions[i].value === k[m]) {
+                  k[m]  = this.countryOptions[i].label
+                }
+                item.countryArea = k.join(',')
+              }
+            }
+          }
+        })
         this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total
+        this.tableLoading = false
       }, e => {
 
       });
@@ -349,6 +366,9 @@ export default {
       })
     }
   },
+  created() {
+    this.searchSarAccess();
+  },
   mounted() {
     // 分页查询数据
     this.searchSarAccess();
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
index b0af84fa9..2be49a492 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
@@ -57,6 +57,7 @@
       </el-button>
     </div>
     <div class="container">
+      <loading :loading="tableLoading">数据获取中</loading>
       <el-table
         :data="sarAccessListDatas"
         tooltip-effect="dark"
@@ -174,6 +175,7 @@ export default {
       sarAccessListDatas: [],
       sarAccessListTotal: 0,
       loading: false,
+      tableLoading: true,
       selectedList: [],
       // 新增、编辑 准入信息字段
       sarAccessEO: {
@@ -277,6 +279,7 @@ export default {
         this.sarAccessListDatas = res.data.records;
         this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total;
+        this.tableLoading = false
       }, e => {
       });
 
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
index 50f1509bf..822bb4bd8 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
@@ -67,6 +67,7 @@
       </el-button>
     </div>
     <div class="container">
+      <loading :loading="tableLoading">数据获取中</loading>
       <el-table
         :data="sarAccessListDatas"
         tooltip-effect="dark"
@@ -177,6 +178,7 @@ export default {
       sarAccessListDatas: [],
       sarAccessListTotal: 0,
       loading: false,
+      tableLoading: true,
       selectedList: [],
       // 新增、编辑 准入信息字段
       sarAccessEO: {
@@ -292,6 +294,7 @@ export default {
             }
           }
         })
+        this.tableLoading = false
         this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total
       }, e => {
@@ -405,6 +408,7 @@ export default {
             }
           }
         })
+        this.tableLoading = false
         this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total
       }, e => {