From 9599c80b075edbf1dc68ae083463185c1a37cf37 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 5 May 2022 17:19:30 +0800
Subject: [PATCH] BUG 29500

---
 src/saas/AppGridManagement/Organization.vue | 87 ++++++++++++++-------
 1 file changed, 58 insertions(+), 29 deletions(-)

diff --git a/src/saas/AppGridManagement/Organization.vue b/src/saas/AppGridManagement/Organization.vue
index 01bdd178..22060bee 100644
--- a/src/saas/AppGridManagement/Organization.vue
+++ b/src/saas/AppGridManagement/Organization.vue
@@ -9,37 +9,45 @@
       </div>
       <div class="right">
         <div class="name">
-          <AiOpenData v-if="item.wxUserId" type="userName" :openid="item.wxUserId" />
+          <AiOpenData v-if="item.wxUserId" type="userName" :openid="item.wxUserId"/>
         </div>
-        <div class="gird">{{item.checkType == 2 ? '网格长' : '网格员'}}</div>
-        <p>{{item.girdName}}</p>
+        <div flex class="spb">
+          <div class="gird" v-text="item.checkType == 2 ? '网格长' : '网格员'"/>
+          <div class="gird dark" v-text="item.label"/>
+        </div>
+        <p>{{ item.girdName }}</p>
       </div>
     </div>
     <div class="user-content user-item" v-for="(item, index) in dataInfo.girdMembers" :key="index" @click="viewUser(item.wxUserIdId)">
-     <div>
+      <div>
         <!-- <image :src="item.photo" alt="" mode="aspectFill" v-if="item.photo" /> -->
         <img :src="item.photo" alt="" v-if="item.photo">
         <img src="./components/img/big-user.png" alt="" v-else>
       </div>
       <div class="right">
         <div class="name">
-          <AiOpenData v-if="item.wxUserId" type="userName" :openid="item.wxUserId" />
-          <span class="gird">{{item.checkType == 2 ? '网格长' : '网格员'}}</span>
-          <span class="num" v-if="item.checkType == 1">家庭数({{item.residentNumber}})</span>
+          <div flex>
+            <AiOpenData v-if="item.wxUserId" type="userName" :openid="item.wxUserId"/>
+            <div class="gird dark" v-text="item.label"/>
+          </div>
+          <span class="gird">{{ item.checkType == 2 ? '网格长' : '网格员' }}</span>
+          <span class="num" v-if="item.checkType == 1">家庭数({{ item.residentNumber }})</span>
         </div>
         <div class="gird-name">
-          <span class="text">{{item.girdName}}</span>
+          <span class="text">{{ item.girdName }}</span>
           <span class="family-btn" @click.stop="toFamily(item)" v-if="item.checkType == 1">责任家庭 ></span>
         </div>
       </div>
     </div>
-    <AiEmpty description="暂无数据" class="emptyWrap" v-if="dataInfo.parentGirdMembers && !dataInfo.parentGirdMembers.length && !dataInfo.girdMembers.length"></AiEmpty>
+    <AiEmpty description="暂无数据" class="emptyWrap"
+             v-if="dataInfo.parentGirdMembers && !dataInfo.parentGirdMembers.length && !dataInfo.girdMembers.length"></AiEmpty>
     <div class="pad-b112"></div>
   </div>
 </template>
 
 <script>
-import { mapActions } from 'vuex'
+import {mapActions} from 'vuex'
+
 export default {
   data() {
     return {
@@ -61,7 +69,7 @@ export default {
     uni.$on('goback', (res) => {
       this.userGird = res
       this.getGirdUserList()
-    }) 
+    })
   },
   methods: {
     ...mapActions(['injectJWeixin', 'wxInvoke']),
@@ -97,7 +105,8 @@ export default {
 <style lang="scss" scoped>
 .Organization {
   background-color: #f5f5f5;
-  .title{
+
+  .title {
     font-size: 38px;
     font-family: PingFangSC-Semibold, PingFang SC;
     font-weight: 600;
@@ -106,26 +115,31 @@ export default {
     padding-left: 32px;
     margin-bottom: 32px;
   }
-  .user-content{
+
+  .user-content {
     width: calc(100% - 64px);
     margin: 0 0 32px 32px;
     background-color: #fff;
     padding: 32px;
     box-sizing: border-box;
     display: flex;
-    img{
+
+    img {
       width: 200px;
       height: 200px;
       margin-right: 32px;
     }
-    image{
+
+    image {
       width: 200px;
       height: 200px;
       margin-right: 32px;
     }
-    .right{
+
+    .right {
       width: 100%;
-      .name{
+
+      .name {
         font-size: 32px;
         font-family: PingFangSC-Medium, PingFang SC;
         font-weight: 500;
@@ -133,7 +147,8 @@ export default {
         line-height: 44px;
         margin-bottom: 12px;
       }
-      .gird{
+
+      .gird {
         display: inline-block;
         line-height: 44px;
         background: #E8EFFF;
@@ -143,8 +158,15 @@ export default {
         font-family: PingFangSC-Regular, PingFang SC;
         color: #26F;
         margin-bottom: 12px;
+
+        &.dark {
+          color: #fff;
+          background: #26f;
+          margin-left: 16px;
+        }
       }
-      p{
+
+      p {
         font-size: 26px;
         font-family: PingFangSC-Regular, PingFang SC;
         color: #666;
@@ -152,40 +174,47 @@ export default {
       }
     }
   }
-  .user-item{
-    img{
+
+  .user-item {
+    img {
       width: 96px;
       height: 96px;
       border-radius: 50%;
     }
-    image{
+
+    image {
       width: 96px;
       height: 96px;
       border-radius: 50%;
     }
-    .gird{
+
+    .gird {
       display: inline-block;
       margin-left: 16px;
-      margin-bottom: 0!important;
+      margin-bottom: 0 !important;
     }
-    .name{
-      margin-bottom: 8px!important;
+
+    .name {
+      margin-bottom: 8px !important;
     }
   }
-  .family-btn{
+
+  .family-btn {
     font-size: 26px;
     font-family: PingFangSC-Regular, PingFang SC;
     color: #3975C6;
     line-height: 36px;
     float: right;
   }
-  .num{
+
+  .num {
     font-size: 26px;
     font-family: PingFangSC-Regular, PingFang SC;
     line-height: 36px;
     float: right;
   }
-  .pad-b112{
+
+  .pad-b112 {
     padding-bottom: 112px;
   }
 }