From d160e19b617ed19f2e13bfe640f91e0870536780 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 6 May 2022 18:37:58 +0800
Subject: [PATCH] BUG 29533

---
 src/components/AiPagePicker.vue    |  2 +-
 src/saas/AppGridManagement/Map.vue | 44 +++++++++++-------------------
 2 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/src/components/AiPagePicker.vue b/src/components/AiPagePicker.vue
index 6326e34a..422f9794 100644
--- a/src/components/AiPagePicker.vue
+++ b/src/components/AiPagePicker.vue
@@ -51,7 +51,7 @@ export default {
         console.log('发送', data)
         this.$emit("update:selected", data)
         this.$emit("select", data)
-        this.$emit("change", data.map(e => e[nodeKey]))
+        this.$emit("change", [data].flat()?.map(e => e[nodeKey]))
       })
       let url = `${config.url}`,
           qsstr = qs.stringify({
diff --git a/src/saas/AppGridManagement/Map.vue b/src/saas/AppGridManagement/Map.vue
index 347afe97..fda17d4c 100644
--- a/src/saas/AppGridManagement/Map.vue
+++ b/src/saas/AppGridManagement/Map.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="detail">
     <div class="grid-select">
-      <AiPagePicker type="custom" class="fill"  @select="handleSelectGird"
+      <AiPagePicker type="custom" class="fill" @select="handleSelectGird"
                     :ops="{url:'./SelectGird',label: 'girdName'}">
         <div class="gird-content">
           <div class="label">网格选择</div>
@@ -20,27 +20,23 @@
         <div class="bg"></div>
         <div class="title">{{ form.girdName }}</div>
         <scroll-view scroll-y="true" class="grid-info">
-          <div v-if="form.girdMemberManageList && form.girdMemberManageList.length">
-            <div class="info-flex" v-for="(item, index) in  form.girdMemberManageList" :key="index">
-              <span class="label">网格长</span>
-              <span class="value">
+          <div class="info-flex" v-for="(item, index) in  form.girdMemberManageList" :key="index">
+            <span class="label">网格长</span>
+            <span class="value">
                 <AiOpenData v-if="item.name" type="userName" :openid="item.name"/>
-                <!-- &nbsp;&nbsp;{{ item.phone }}
-                <img :src="$cdn + 'common/phone.png'" alt="" @click="callPhone(item.phone)" class="phone-icon"
-                     v-if="item.phone"> -->
+              <!-- &nbsp;&nbsp;{{ item.phone }}
+              <img :src="$cdn + 'common/phone.png'" alt="" @click="callPhone(item.phone)" class="phone-icon"
+                   v-if="item.phone"> -->
               </span>
-            </div>
           </div>
-          <div v-if="form.girdMemberList && form.girdMemberList.length">
-            <div class="info-flex" v-for="(item, index) in  form.girdMemberList" :key="index">
-              <span class="label">网格员</span>
-              <span class="value">
+          <div class="info-flex" v-for="(item, index) in  form.girdMemberList" :key="index">
+            <span class="label">网格员</span>
+            <span class="value">
                 <AiOpenData v-if="item.name" type="userName" :openid="item.name"/>
-                <!-- &nbsp;&nbsp;{{ item.phone }}
-                <img :src="$cdn + 'common/phone.png'" alt="" @click="callPhone(item.phone)" class="phone-icon"
-                     v-if="item.phone"> -->
+              <!-- &nbsp;&nbsp;{{ item.phone }}
+              <img :src="$cdn + 'common/phone.png'" alt="" @click="callPhone(item.phone)" class="phone-icon"
+                   v-if="item.phone"> -->
               </span>
-            </div>
           </div>
         </scroll-view>
       </div>
@@ -77,13 +73,9 @@ export default {
       this.getGridList(e.id, true)
     })
   },
-  onShow() {
-    document.title = "网格管理"
-  },
-
   methods: {
     handleSelectGird(v) {
-      this.form = v||{}
+      this.form = v || {}
       this.getGridList(v?.id, true)
     },
     toChoose() {
@@ -352,8 +344,8 @@ export default {
       line-height: 40px;
       font-size: 28px;
 
-      &:last-child {
-        border: none;
+      &:last-of-type {
+        border-bottom: none;
       }
 
       .label {
@@ -382,10 +374,6 @@ export default {
   }
 }
 
-.grid-name {
-  display: inline-block;
-}
-
 .footer {
   width: 100%;
   position: fixed;