From ea4c4a10c52020c827adf43f772bd3b716dce921 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 17 Aug 2021 17:15:12 +0800
Subject: [PATCH] feat: There is no way the

---
 .../foreignStandardsAndRegulations/index.vue  | 52 ++++++++-----------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 36da9467c..e2297f63a 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -671,37 +671,19 @@
               </el-col>
 
               <template v-if="index === 0" >
-<!--                <el-form-item label="国家/地区" prop="" label-width="150px" class="add-form-item">-->
-<!--                  <el-select v-model="sarStandardsInfoEO.country" filterable clearable>-->
-<!--                    <el-option-->
-<!--                        v-for="item in countryOptions"-->
-<!--                        placeholder="请选择"-->
-<!--                        :key="item.value"-->
-<!--                        :value="item.value"-->
-<!--                        :label="item.label"-->
-<!--                    ></el-option>-->
-<!--                  </el-select>-->
-<!--                </el-form-item>-->
-                {{sarStandardsInfoEO.country}}
-                <el-form-item label="国家/地区" prop="countryArea" class="search-item">
-                  <el-select
-                      v-model="sarStandardsInfoEO.country"
-                      multiple
-                      placeholder="请选择"
-                      filterable
-                      :disabled="false"
-                      class="wx-resolve"
-                  >
+                <el-form-item label="国家/地区" prop="" label-width="150px" class="add-form-item">
+                  <el-select v-model="sarStandardsInfoEO.country" multiple filterable clearable>
                     <el-option
                         v-for="item in countryOptions"
-                        :value="item.value"
+                        placeholder="请选择"
                         :key="item.value"
+                        :value="item.value"
                         :label="item.label"
                     >
+                      {{ item.label }}
                     </el-option>
                   </el-select>
                 </el-form-item>
-
                 <el-form-item label="标准类别" prop="standSort" label-width="150px" class="add-form-item">
                   <el-select v-model="sarStandardsInfoEO.standSort" filterable>
                     <el-option
@@ -1692,6 +1674,7 @@ export default {
         id: '',
         standType: 'FOREIGN', // 标准分类
         country: '',
+        countryArr:'',
         standSort: '',
         applyArctic: '',
         standNumber: '',
@@ -2119,6 +2102,19 @@ export default {
   props: {
   },
   watch: {
+    'sarStandardsInfoEO.country': {
+      handler (val) {
+        if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+          if (val instanceof Array) {
+            this.sarStandardsInfoEO.countryArr = val.join(",");
+          } else {
+            this.sarStandardsInfoEO.countryArr = val
+          }
+        } else if (val === '') {
+          this.sarStandardsInfoEO.countryArr = []
+        }
+      }
+    },
     filterText(val) {
       this.$refs.tree.filter(val);
     }
@@ -2435,10 +2431,9 @@ export default {
             console.log(formFieldList, 'AAAAAAAAAAAAAAAAAAAAA')
           this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
           this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
-          console.log(item.country);
-          console.log("hello")
-          this.sarStandardsInfoEO.country=item.country;
-          console.log(this.sarStandardsInfoEO.country);
+          if(item.country !== undefined && item.country !== null){
+            this.sarStandardsInfoEO.country = item.country.split(",");
+          }
           this.sarStandardsInfoEO.standSort = item.standSort
           if (this.sarStandardsInfoEO.putTime != null && this.sarStandardsInfoEO.putTime !== '') {
             this.sarStandardsInfoEO.putTime = this.sarStandardsInfoEO.putTime.replace(new RegExp(/-/gm), '/')
@@ -3113,8 +3108,7 @@ export default {
                   this.validateStandNumber(this.sarStandardsInfoEO).then((flag) => {
                       if (flag) {
                           // 时间格式修改
-                          this.sarStandardsInfoEO.country=JSON.stringify(this.sarStandardsInfoEO.country);
-                          console.groupCollapsed(this.sarStandardsInfoEO.country);
+                          this.sarStandardsInfoEO.country = this.sarStandardsInfoEO.countryArr;
                           let nowstandinfo = JSON.parse(JSON.stringify(this.sarStandardsInfoEO))
                           if (nowstandinfo.putTime != null && nowstandinfo.putTime !== '') {
                               nowstandinfo.putTime = this.$dateFormat(this.sarStandardsInfoEO.putTime, 'yyyy-MM-dd hh:mm:ss')