From 6135040b5287a3351eafb558d6944c9bf9b74137 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 21 Jan 2022 09:17:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../2.0.5/AppGridMember/components/Family.vue | 23 ++++++++++++++++---
 .../2.0.5/AppGridMember/components/list.vue   |  1 +
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/packages/2.0.5/AppGridMember/components/Family.vue b/packages/2.0.5/AppGridMember/components/Family.vue
index 3b24acce..f54e6d04 100644
--- a/packages/2.0.5/AppGridMember/components/Family.vue
+++ b/packages/2.0.5/AppGridMember/components/Family.vue
@@ -8,6 +8,15 @@
         <template #left>
           <el-button size="small" type="primary" icon="iconfont iconAdd" @click="isShow = true">添加</el-button>
           <el-button size="small" :disabled="!ids.length" icon="iconfont iconDelete" @click="removeAll">批量删除</el-button>
+          <el-select size="small" style="width: 200px;" v-model="search.girdId" placeholder="所属网格" clearable @change="getListInit()">
+            <el-option
+              v-for="(item,i) in girdList"
+              :key="i"
+              :label="item.girdName"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
         </template>
         <template #right>
           <el-input
@@ -60,7 +69,7 @@
                 :value="item.id"
               >
               </el-option>
-              </el-select>
+            </el-select>
           </el-form-item>
         </el-form>
         <div class="AiWechatSelecter-container">
@@ -132,7 +141,8 @@
         search: {
           current: 1,
           size: 10,
-          name: ''
+          name: '',
+          girdId: ''
         },
         isLoading: false,
         form: {
@@ -148,6 +158,7 @@
           { prop: 'name',  label: '户主姓名', align: 'left', width: '200px' },
           { prop: 'idNumber', label: '身份证号', align: 'center' },
           { prop: 'phone', label: '联系电话', align: 'center' },
+          { prop: 'girdName', label: '所属网格', align: 'center' },
           { prop: 'createTime', label: '添加时间', align: 'center' },
           { slot: 'options', label: '操作', align: 'center' }
         ],
@@ -156,7 +167,7 @@
         ids: [],
         disabledLevel: 0,
         girdList: [],
-        girdId: ''
+        girdId: '',
       }
     },
 
@@ -182,6 +193,10 @@
           }
         })
       },
+      getListInit() {
+        this.search.current = 1
+        this.getList()
+      },
       getList () {
         this.instance.post(`/app/appgirdmemberresident/listByGirdMember`, null, {
           params: {
@@ -235,6 +250,8 @@
             this.getList()
             this.$message.success('添加成功')
             this.isShow = false
+            this.chooseUser = []
+            this.girdId = ''
           }
         })
       },
diff --git a/packages/2.0.5/AppGridMember/components/list.vue b/packages/2.0.5/AppGridMember/components/list.vue
index 45f4717d..b1ee46d0 100644
--- a/packages/2.0.5/AppGridMember/components/list.vue
+++ b/packages/2.0.5/AppGridMember/components/list.vue
@@ -95,6 +95,7 @@ export default {
   },
   created() {
     this.dict.load("sex", "girdMemberType", "politicsStatus", "education");
+    this.getGirdList()
     this.getList();
   },
   computed: {