From a134902bd664892c4fef1ec8e7e5ca9dc39489d1 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 27 May 2022 13:59:27 +0800
Subject: [PATCH] BUG 29893

---
 .../grid/AppGridMember/components/Family.vue  |  2 +-
 .../AppGridMember/components/MonitorUser.vue  | 77 ++++---------------
 2 files changed, 16 insertions(+), 63 deletions(-)

diff --git a/packages/grid/AppGridMember/components/Family.vue b/packages/grid/AppGridMember/components/Family.vue
index 8718a164..de789647 100644
--- a/packages/grid/AppGridMember/components/Family.vue
+++ b/packages/grid/AppGridMember/components/Family.vue
@@ -50,7 +50,7 @@
       </ai-table>
       <ai-dialog
           :visible.sync="dialog"
-          width="1000px"
+          width="1100px"
           @close="closeDialog"
           title="添加户主"
           @onConfirm="onConfirm">
diff --git a/packages/grid/AppGridMember/components/MonitorUser.vue b/packages/grid/AppGridMember/components/MonitorUser.vue
index 0c1b57e7..d50543b1 100644
--- a/packages/grid/AppGridMember/components/MonitorUser.vue
+++ b/packages/grid/AppGridMember/components/MonitorUser.vue
@@ -51,71 +51,24 @@
       </ai-table>
       <ai-dialog
           :visible.sync="isShow"
-          width="890px"
+          width="1100px"
           @close="closeDialog"
           title="添加户主"
           @onConfirm="onConfirm">
-        <ai-area-select clearable always-show :instance="instance" v-model="areaId" :disabled-level="disabledLevel"
-                        @change="search.current = 1, getUserList()"></ai-area-select>
-        <span style="margin-top:16px;"><span style="color:#f46;margin-right:4px;">*</span>网格：</span>
-        <el-select size="small" style="width: 280px;margin-top:16px;" v-model="girdId" placeholder="请选择网格" clearable>
-          <el-option
-              v-for="(item,i) in girdList"
-              :key="i"
-              :label="item.girdName"
-              :value="item.id"
-          >
-          </el-option>
-        </el-select>
-        <div class="AiWechatSelecter-container">
-          <div class="AiWechatSelecter-container__left" v-loading="isLoading">
-            <div class="AiWechatSelecter-header">
-              <div class="AiWechatSelecter-header__left">
-                <h2>户主信息列表</h2>
-              </div>
-              <el-input
-                  class="search-input"
-                  size="mini"
-                  placeholder="请输入姓名/身份证号"
-                  v-model="name"
-                  clearable
-                  v-throttle="getUserList"
-                  @clear="name = '', getUserList()"
-                  suffix-icon="iconfont iconSearch">
-              </el-input>
-            </div>
-            <el-scrollbar class="AiWechatSelecter-list">
-              <el-checkbox-group v-model="chooseUser">
-                <el-checkbox
-                    :label="`${item.name}~${item.id}`"
-                    v-for="(item, index) in userList"
-                    :key="index">
-                  {{ item.name }}-{{ item.idNumber }}
-                </el-checkbox>
-              </el-checkbox-group>
-              <AiEmpty v-if="!this.userList.length"></AiEmpty>
-            </el-scrollbar>
-          </div>
-          <div class="AiWechatSelecter-container__right">
-            <div class="AiWechatSelecter-header AiWechatSelecter-header__right">
-              <h2>已选择</h2>
-              <el-button size="mini" icon="el-icon-delete" @click="clearAll">清空</el-button>
-            </div>
-            <el-scrollbar class="AiWechatSelecter-list">
-              <div class="tags-wrapper">
-                <el-tag
-                    v-for="(item, index) in chooseUser"
-                    :key="index"
-                    closable
-                    @close="del(item)"
-                    size="small"
-                    type="info">
-                  {{ item.split('~')[0] }}
-                </el-tag>
-              </div>
-            </el-scrollbar>
-          </div>
-        </div>
+        <el-form ref="DialogForm" size="small" label-width="0">
+          <el-form-item>
+            <ai-area-select clearable always-show :instance="instance" v-model="areaId" :disabled-level="disabledLevel"/>
+          </el-form-item>
+          <el-form-item label="网格：" required label-width="80px">
+            <el-select size="small" v-model="girdId" placeholder="请选择网格" clearable>
+              <el-option v-for="(item,i) in girdList" :key="i" :label="item.girdName" :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <ai-table-select :instance="instance" :action="`/app/appresident/list?householdName=1&areaId=${areaId}`"
+                             @select="v=>chooseUser=v"/>
+          </el-form-item>
+        </el-form>
       </ai-dialog>
     </template>
   </ai-list>