From b4b4983236a077497a638d918398c9df4e13dd4d Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 6 May 2022 18:01:26 +0800
Subject: [PATCH] BUG 29517

---
 src/saas/AppBackUserList/AppBackUserList.vue  | 23 ++++-------
 src/saas/AppBuilding/AppBuilding.vue          | 41 ++++++++-----------
 .../AppConflictMediation.vue                  | 33 +++++----------
 .../AppGridManagement/AppGridManagement.vue   | 14 +++----
 4 files changed, 42 insertions(+), 69 deletions(-)

diff --git a/src/saas/AppBackUserList/AppBackUserList.vue b/src/saas/AppBackUserList/AppBackUserList.vue
index c9386747..d59f2bfb 100644
--- a/src/saas/AppBackUserList/AppBackUserList.vue
+++ b/src/saas/AppBackUserList/AppBackUserList.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="BackUserList">
-    <AiTopFixed v-if="isAdmin">
+    <AiTopFixed v-if="isGridMember">
       <div class="pad-t32"></div>
       <div class="select-gird">
         <AiPagePicker type="custom" @select="confirmSelect" v-model="girdId" self
@@ -34,7 +34,7 @@
         <div class="item" :class="tabIndex ? 'active' : ''" @click="tabClick(1)">异常人员<span></span></div>
       </div>
     </AiTopFixed>
-    <div class="user-list" v-if="isAdmin">
+    <div class="user-list" v-if="isGridMember">
       <div class="item" @click="toUser(item)" v-for="(item,index) in list" :key="index">
         <h2 class="name">{{ item.name }}<span class="status" v-if="item.status == 0">有异常</span></h2>
         <p class="color-999">{{ item.idNumber }}</p>
@@ -44,13 +44,13 @@
         <p><img src="./components/img/time-icon.png" alt="">{{ item.arriveTime }}</p>
       </div>
     </div>
-    <AiEmpty v-if="!list.length && isAdmin"></AiEmpty>
-    <div v-if="!isAdmin" class="empty">
+    <AiEmpty v-if="!list.length && isGridMember"></AiEmpty>
+    <div v-if="!isGridMember" class="empty">
       <img src="./components/img/no-admin.png" alt="">
       <p>没有网格员权限<br/>无法查看返乡登记哦~</p>
     </div>
     <div class="pad-b120"></div>
-    <div class="footer" v-if="isAdmin">
+    <div class="footer" v-if="isGridMember">
       <div class="bg-fff"
            @click="linkTo(`./Add?arriveGirdId=${girdId}&arriveGirdName=${encodeURIComponent(girdName)}`)">登记
       </div>
@@ -94,7 +94,6 @@ export default {
       list: [],
       name: '',
       totalInfo: {},
-      isAdmin: true,
       show: false,
       girdName: '',
       girdId: '',
@@ -108,10 +107,12 @@ export default {
     shareLink() {
       let {girdId, girdName, user: {corpId}} = this
       return location.origin + `/apps/AppBackUserList/add?corpId=${corpId}&arriveGirdId=${girdId}&arriveGirdName=${encodeURIComponent(girdName)}`
+    },
+    isGridMember() {
+      return this.user.girdCheckType > 0
     }
   },
   onLoad() {
-    this.isGirdUser()
     this.girdId = this.user.girdId
     this.confirmSelect(this.user)
     uni.$on('updateBackList', () => {
@@ -166,14 +167,6 @@ export default {
     linkTo(url) {
       uni.navigateTo({url})
     },
-    isGirdUser() {
-      this.isAdmin = false
-      this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
-        if (res?.data) {
-          this.isAdmin = res.data.checkType != '0'
-        }
-      })
-    },
     close() {
       this.show = false
     },
diff --git a/src/saas/AppBuilding/AppBuilding.vue b/src/saas/AppBuilding/AppBuilding.vue
index ce5dae33..048f4a8c 100644
--- a/src/saas/AppBuilding/AppBuilding.vue
+++ b/src/saas/AppBuilding/AppBuilding.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="AppBuilding">
-    <search-map v-if="show && isAdmin"/>
-    <div v-if="!isAdmin" class="empty">
+    <search-map v-if="show && isGridMember"/>
+    <div v-if="!isGridMember" class="empty">
       <img src="https://cdn.cunwuyun.cn/dvcp/h5/no-data.png" alt="">
       <p>没有网格员权限<br/>无法查看楼栋信息哦~</p>
     </div>
@@ -11,15 +11,21 @@
 <script>
 
 import SearchMap from "./components/searchMap";
+import {mapState} from "vuex";
 
 export default {
   name: 'AppBuilding',
   components: {SearchMap},
   appName: '以房找人',
+  computed: {
+    ...mapState(['user']),
+    isGridMember() {
+      return this.user.girdCheckType > 0
+    }
+  },
   data() {
     return {
       show: true,
-      isAdmin: false
     }
   },
   onShow() {
@@ -28,44 +34,31 @@ export default {
       this.show = true
     })
     document.title = "以房找人"
-    this.isGirdUser()
   },
-  methods: {
-    isGirdUser() {
-      this.isAdmin = false
-      this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
-        if (res.code == 0) {
-          if (res.data.checkType != '0') {
-            this.isAdmin = true
-          }
-        }
-      })
-    },
-  }
 }
 </script>
 
 <style lang="scss" scoped>
-uni-page-body {
-  height: 100%;
-}
-
 .AppBuilding {
   height: 100%;
-  .empty{
+
+  .empty {
     height: 100%;
-    img{
+
+    img {
       width: 282px;
       height: 306px;
       margin: 168px 0 0 234px;
     }
-    p{
+
+    p {
       text-align: center;
       font-size: 28px;
       font-family: PingFangSC-Regular, PingFang SC;
       color: #999;
       line-height: 44px;
-      span{
+
+      span {
         color: #467DFE;
       }
     }
diff --git a/src/saas/AppConflictMediation/AppConflictMediation.vue b/src/saas/AppConflictMediation/AppConflictMediation.vue
index 0c531ad2..8367e6c8 100644
--- a/src/saas/AppConflictMediation/AppConflictMediation.vue
+++ b/src/saas/AppConflictMediation/AppConflictMediation.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="AppHandSnapshot">
-    <component v-if="refresh && isAdmin" :is="component" @change="onChange" :params="params"> </component>
-    <div v-if="!isAdmin" class="empty">
+    <component v-if="refresh && isGridMember" :is="component" @change="onChange" :params="params"> </component>
+    <div v-if="!isGridMember" class="empty">
       <img src="./components/img/no-admin.png" alt="">
       <p>没有网格员权限<br />无法查看矛盾调解信息哦~</p>
     </div>
@@ -10,11 +10,11 @@
 
 <script>
 import List from './List.vue'
+import {mapState} from "vuex";
 
 export default {
   name: 'AppConflictMediation',
   appName: '矛盾调解',
-
   data() {
     return {
       component: 'List',
@@ -22,33 +22,20 @@ export default {
       refresh: true,
       tabIndex: 0,
       isTab: true,
-      isAdmin: false
     }
   },
-
-  components: {
-    List,
+  components: {List},
+  computed:{
+    ...mapState(['user']),
+    isGridMember() {
+      return this.user.girdCheckType > 0
+    }
   },
-
   methods: {
     onChange(e) {
       this.params = e.params
       this.component = e.type
     },
-    
-    isGirdUser() {
-      this.isAdmin = false
-      this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
-        if (res?.data) {
-          if (res.data.checkType != '0') {
-            this.isAdmin = true
-          }
-        }
-      })
-    },
-  },
-  onLoad() {
-    this.isGirdUser()
   },
   onShow() {
     document.title = '矛盾调解'
@@ -58,7 +45,7 @@ export default {
     uni.$on('showTab', () => {
       this.isTab = true
     })
-    
+
   },
   onReachBottom() {
     if(!this.tabIndex) {
diff --git a/src/saas/AppGridManagement/AppGridManagement.vue b/src/saas/AppGridManagement/AppGridManagement.vue
index dee0c926..6faf3379 100644
--- a/src/saas/AppGridManagement/AppGridManagement.vue
+++ b/src/saas/AppGridManagement/AppGridManagement.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="AppGridManagement">
-    <div class="pad-t32" v-if="component != 'Map' && isAdmin"></div>
-    <div class="select-gird" v-if="component != 'Map' && isAdmin" flex>
+    <div class="pad-t32" v-if="component != 'Map' && isGridMember"></div>
+    <div class="select-gird" v-if="component != 'Map' && isGridMember" flex>
       <AiPagePicker type="custom" class="fill" @select="handleSelectGird"
                     :ops="{url:'./SelectGird',label: 'girdName'}">
         <div flex>
@@ -11,14 +11,14 @@
       </AiPagePicker>
       <span @click="linkTo('./SetGird')" v-if="isGridAdmin">网格配置</span>
     </div>
-    <component v-if="refresh && isAdmin" :is="component" @change="onChange" :params="params"></component>
-    <div class="tabs" v-if="isTab && isAdmin">
+    <component v-if="refresh && isGridMember" :is="component" @change="onChange" :params="params"></component>
+    <div class="tabs" v-if="isTab && isGridMember">
       <div class="item" @click="tabClick(index, item.component)" v-for="(item, index) in tabs" :key="index">
         <img :src="tabIndex == index ? item.activeImg : item.img" alt=""/>
         <p :class="tabIndex == index ? 'color-3267F0' : ''">{{ item.text }}</p>
       </div>
     </div>
-    <div v-if="!isAdmin" class="empty">
+    <div v-if="!isGridMember" class="empty">
       <img src="./components/img/no-admin.png" alt="">
       <p>没有网格员权限<br/>无法查看网格信息哦~</p>
     </div>
@@ -36,7 +36,7 @@ export default {
   appName: '网格管理',
   computed: {
     ...mapState(['user']),
-    isAdmin() {
+    isGridMember() {
       return this.user.girdCheckType > 0
     },
     isGridAdmin() {
@@ -93,7 +93,7 @@ export default {
       this.refreshHome();
     },
     getGridInfo() {
-      this.isAdmin && this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
+      this.isGridMember && this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
         if (res?.data) {
           this.params = res.data?.appGirdInfo || {}
         }