From 56398dbc9f12c1cafd34977ffbcde7f297d0b35e Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 14 Jan 2022 14:56:28 +0800
Subject: [PATCH 1/2] bug

---
 src/apps/AppGridManagement/Organization.vue | 2 +-
 src/apps/AppGridManagement/Statistics.vue   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppGridManagement/Organization.vue b/src/apps/AppGridManagement/Organization.vue
index 6bf48c19..f67fd214 100644
--- a/src/apps/AppGridManagement/Organization.vue
+++ b/src/apps/AppGridManagement/Organization.vue
@@ -6,7 +6,7 @@
         {{userGird.girdName}}
         <img src="./components/img/down-icon.png" alt="" class="down-icon"> 
       </div>
-      <span @click="linkTo('./SetGird')" v-if="checkType == 2">网格配置</span>
+      <span @click="linkTo('./SetGird')">网格配置</span>
     </div>
     <div class="title">网格人员</div>
     <div class="user-content" v-for="(item, index) in dataInfo.parentGirdMembers" :key="index">
diff --git a/src/apps/AppGridManagement/Statistics.vue b/src/apps/AppGridManagement/Statistics.vue
index 4aa3df01..46ba1d4d 100644
--- a/src/apps/AppGridManagement/Statistics.vue
+++ b/src/apps/AppGridManagement/Statistics.vue
@@ -100,9 +100,10 @@ export default {
           this.girdUser = res.data
           this.checkType = res.data.checkType
           if (this.girdUser.checkType != '0') {
-            this.getList()
+            
             if (this.girdUser.appGirdInfo) {
               this.girdMsgList = this.girdUser.appGirdInfo
+              this.getList()
             }
           } else {
             this.$u.toast('当前人员不是网格员或网格管理员')
@@ -112,7 +113,7 @@ export default {
     },
 
     getList() {
-      this.$http.post(`/app/appgirdmemberinfo/girdMemberAndResidentStatistic?girdId=${this.girdMsgList.girdId}`).then((res) => {
+      this.$http.post(`/app/appgirdmemberinfo/girdMemberAndResidentStatistic?girdId=${this.girdMsgList.id}`).then((res) => {
         if (res.code == 0) {
           this.peopleList = res.data
         }

From 0d86c86852e136627b5a4d9904bbdd7a297605c2 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 14 Jan 2022 15:05:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=88=91=E7=A9=BAbug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppGridManagement/FamilyList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/apps/AppGridManagement/FamilyList.vue b/src/apps/AppGridManagement/FamilyList.vue
index 9f99d4bb..5d87b7a5 100644
--- a/src/apps/AppGridManagement/FamilyList.vue
+++ b/src/apps/AppGridManagement/FamilyList.vue
@@ -21,6 +21,7 @@
         </li>
       </ul>
     </div>
+    <AiEmpty description="暂无数据" class="emptyWrap" v-if="!list.length"></AiEmpty>
     <div class="footer" @click="toAddFamily()" v-if="checkType == 2">新增责任家庭</div>
   </div>
 </template>