From 4e3590d0c65d154e2cb6d308b21aa6a4785a43b2 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 6 May 2022 18:17:23 +0800
Subject: [PATCH] BUG 29526

---
 src/saas/AppConflictMediation/SelectUser.vue | 61 +++++++-------------
 1 file changed, 22 insertions(+), 39 deletions(-)

diff --git a/src/saas/AppConflictMediation/SelectUser.vue b/src/saas/AppConflictMediation/SelectUser.vue
index 787a2e73..f68d9874 100644
--- a/src/saas/AppConflictMediation/SelectUser.vue
+++ b/src/saas/AppConflictMediation/SelectUser.vue
@@ -10,13 +10,10 @@
         <div v-if="treeList.length > 0">
           <div class="cards" v-for="(item, index) in treeList" :key="index" @click="itemClick(item)">
             <div class="imges">
-              <span v-if="item.girdLevel == 1" style="width: 24px;"></span>
-              <span v-if="item.girdLevel == 2">
-                <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="item.isChecked"
-                     @click.stop="girdClick(item, index)"/>
-                <img src="./components/img/xz.png" alt="" class="imgselect" v-else
-                     @click.stop="girdClick(item, index)"/>
-              </span>
+              <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="item.isChecked"
+                   @click.stop="girdClick(item, index)"/>
+              <img src="./components/img/xz.png" alt="" class="imgselect" v-else
+                   @click.stop="girdClick(item, index)"/>
               <img src="./components/img/gird--select-icon.png" alt="" class="avatras"/>
             </div>
             <div class="rightes">
@@ -91,20 +88,10 @@ export default {
     },
 
     treeInit() {
-      if (this.allData[0].girdLevel == 2) {
-        if (this.allData[0].girdMemberList && this.allData[0].girdMemberList.length) {
-          this.userList = this.allData[0].girdMemberList
-          this.userList.map((item) => {
-            item.isChecked = item.id == this.selectUser.id
-          })
-        }
-      } else {
-        this.treeList = this.allData[0].girdList
-      }
-      var obj = {
-        girdName: this.allData[0].girdName,
-        id: this.allData[0].id,
-        girdLevel: this.allData[0].girdLevel
+      this.treeList = this.allData.girdList
+      let obj = {
+        girdName: this.allData.girdName,
+        id: this.allData.id,
       }
       this.slectList.push(obj)
     },
@@ -113,7 +100,6 @@ export default {
       var obj = {
         girdName: row.girdName,
         id: row.id,
-        girdLevel: row.girdLevel
       }
       this.slectList.push(obj)
       this.searckGird(row)
@@ -121,23 +107,20 @@ export default {
 
     searckGird(row) {
       this.treeList = []
-      if (row.girdLevel != 2) { //查网格
-        this.$http.post(`/app/appgirdinfo/list?parentGirdId=${row.id}&size=999`).then((res) => {
-          if (res?.data) {
-            this.treeList = res.data.records.map(e => ({...e, isChecked: e.id == this.selectUser.id}))
-          }
-        })
-      } else { //查网格员
-        this.userList = []
-        this.$http.post(`/app/appgirdmemberinfo/listByGirdIdByThree?girdId=${row.id}`).then((res) => {
-          if (res?.data) {
-            this.userList = res.data
-            this.userList.map((item) => {
-              item.isChecked = item.id == this.selectUser.id
-            })
-          }
-        })
-      }
+      this.$http.post(`/app/appgirdinfo/list?parentGirdId=${row.id}&size=999`).then((res) => {
+        if (res?.data) {
+          this.treeList = res.data.records.map(e => ({...e, isChecked: e.id == this.selectUser.id}))
+        }
+      })
+      this.userList = []
+      this.$http.post(`/app/appgirdmemberinfo/listByGirdIdByThree?girdId=${row.id}`).then((res) => {
+        if (res?.data) {
+          this.userList = res.data
+          this.userList.map((item) => {
+            item.isChecked = item.id == this.selectUser.id
+          })
+        }
+      })
     },
 
     girdNameClick(row, index) {