From c02f2d17670afedb76d82d394645cf0bf4b5d799 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 9 Feb 2022 10:45:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=EF=BC=88=E5=AE=B6=E5=BA=AD?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/saas/AppGridManagement/FamilyList.vue   | 2 +-
 src/saas/AppGridManagement/Organization.vue | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/saas/AppGridManagement/FamilyList.vue b/src/saas/AppGridManagement/FamilyList.vue
index f68355a7..95212203 100644
--- a/src/saas/AppGridManagement/FamilyList.vue
+++ b/src/saas/AppGridManagement/FamilyList.vue
@@ -58,7 +58,7 @@ export default {
   },
   methods: {
     getList(){
-       this.$http.post(`/app/appgirdmemberresident/listByGirdMember?current=${this.current}&girdMemberId=${this.userId}&girdId=${this.girdId}`).then((res) => {
+      this.$http.post(`/app/appgirdmemberresident/listByGirdMember?current=${this.current}&girdMemberId=${this.userId}&girdId=${this.girdId}&name=${this.keyword}`).then((res) => {
         if (res.code == 0) {
          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
         }
diff --git a/src/saas/AppGridManagement/Organization.vue b/src/saas/AppGridManagement/Organization.vue
index dfa39b91..f8e75de5 100644
--- a/src/saas/AppGridManagement/Organization.vue
+++ b/src/saas/AppGridManagement/Organization.vue
@@ -16,11 +16,11 @@
       <div class="right">
         <div class="name">{{item.name}} 
           <span class="gird">{{item.checkType == 2 ? '网格长' : '网格员'}}</span>
-          <span class="num" v-if="item.checkType == 1">家庭数(10)</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="family-btn" @click="linkTo(`./FamilyList?id=${item.id}&girdId=${userGird.id}`)" v-if="item.checkType == 1">责任家庭 ></span>
+          <span class="family-btn" @click="toFamily(item)" v-if="item.checkType == 1">责任家庭 ></span>
         </div>
       </div>
     </div>
@@ -70,6 +70,9 @@ export default {
               //错误处理
           }
       });
+    },
+    toFamily(item) {
+      uni.navigateTo({url: `./FamilyList?id=${item.id}&girdId=${this.userGird.id}`})
     }
   },
 }