From a92bb310a789f6f1fb57d335a94e5f968e52bff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com>
Date: Thu, 20 Jan 2022 10:53:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E5=AE=A1=E6=A0=B8=E5=9F=8E?=
 =?UTF-8?q?=E5=B8=82=E9=A2=86=E5=9F=9F=E5=9B=9E=E6=98=BE=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/CityOptions/index.vue  |  9 +++++++
 src/views/components/FieldOptions/index.vue | 26 +++++++++++++++++----
 src/views/examine/expert/detail.vue         |  1 -
 src/views/examine/expert/index.vue          | 12 +++++++++-
 4 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/views/components/CityOptions/index.vue b/src/views/components/CityOptions/index.vue
index 47e0f72..7aaf5f7 100644
--- a/src/views/components/CityOptions/index.vue
+++ b/src/views/components/CityOptions/index.vue
@@ -87,6 +87,15 @@ export default {
       },
     };
   },
+  watch: {
+    value(newOld) {
+      const data = Object.assign({}, newOld);
+      this.provinceCodeChange(data.province);
+      this.cityCodeChange(data.city);
+      newOld.city = data.city;
+      newOld.district = data.district;
+    },
+  },
   methods: {
     getProvinceByParent(id) {
       return new Promise((resolve, reject) => {
diff --git a/src/views/components/FieldOptions/index.vue b/src/views/components/FieldOptions/index.vue
index 070f36f..eab5770 100644
--- a/src/views/components/FieldOptions/index.vue
+++ b/src/views/components/FieldOptions/index.vue
@@ -64,10 +64,15 @@
               closable
               @close="handleFieldClose(index)"
             >
-              <span v-for="(item, i) in tag" :key="item.id">
-                {{ item.name }}
-                <span v-if="tag.length != i + 1">></span>
-              </span>
+              <template v-if="Array.isArray(tag)">
+                <span v-for="(item, i) in tag" :key="item.id">
+                  {{ item.name }}
+                  <span v-if="tag.length != i + 1">></span>
+                </span>
+              </template>
+              <template v-else>
+                <span>{{ tag }}</span>
+              </template>
             </el-tag>
           </div>
         </el-form-item>
@@ -100,6 +105,19 @@ export default {
       },
     };
   },
+  watch: {
+    value(newVal, oldVal) {
+      let _key = [];
+      let _value = [];
+      for (let i = 0; i < newVal.industrys.length; i++) {
+        const item = newVal.industrys[i];
+        _key.push(item.key);
+        _value.push(item.value);
+      }
+      newVal.industrys = _key;
+      this.industrysTags = _value;
+    },
+  },
   methods: {
     getFieldByParent(id) {
       return new Promise((resolve, reject) => {
diff --git a/src/views/examine/expert/detail.vue b/src/views/examine/expert/detail.vue
index 68279f3..5bacfd5 100644
--- a/src/views/examine/expert/detail.vue
+++ b/src/views/examine/expert/detail.vue
@@ -78,7 +78,6 @@ export default {
       return;
     }
     expertDetail({ id }).then((res) => {
-      console.log(res);
       this.form = res.data;
     });
   },
diff --git a/src/views/examine/expert/index.vue b/src/views/examine/expert/index.vue
index 0acaa3b..770e6d2 100644
--- a/src/views/examine/expert/index.vue
+++ b/src/views/examine/expert/index.vue
@@ -51,7 +51,17 @@
     <el-table v-loading="loading" :data="userList">
       <el-table-column label="数据编号" align="center" width="150" prop="id" />
       <el-table-column label="专家姓名" align="center" prop="name" />
-      <el-table-column label="研究领域" align="center" prop="industry" />
+      <el-table-column
+        label="研究领域"
+        align="center"
+        prop="industrys"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          <div>{{ scope.row.industrys[0] }}</div>
+          <!-- <div v-for="item in scope.row.industrys" :key="item">{{ item }}</div> -->
+        </template>
+      </el-table-column>
       <el-table-column
         label="所属科研机构"
         align="center"