Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

packages/2.0.5/AppGridMember/components/Family.vue

@@ -46,6 +46,23 @@
         title="添加户主"
         @onConfirm="onConfirm">
         <ai-area-select clearable always-show :instance="instance"  v-model="areaId" :disabled-level="disabledLevel"></ai-area-select>
+        <el-form
+          ref="rules"
+          size="small"
+          label-suffix="："
+          label-width="80px" style="margin-top:16px;">
+          <el-form-item label="网格" prop="name" required="true">
+            <el-select size="medium" style="width: 280px;" 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>
+          </el-form-item>
+        </el-form>
         <div class="AiWechatSelecter-container">
           <div class="AiWechatSelecter-container__left" v-loading="isLoading">
             <div class="AiWechatSelecter-header">
@@ -137,7 +154,9 @@
         tableData: [],
         areaId: '',
         ids: [],
-        disabledLevel: 0
+        disabledLevel: 0,
+        girdList: [],
+        girdId: ''
       }
     },
 
@@ -149,12 +168,20 @@
       this.areaId = this.user.info.areaId
       this.disabledLevel = this.user.info.areaList.length
       this.dict.load('epidemicDangerousAreaLevel').then(() => {
+        this.getGirdList()
         this.getList()
         this.getUserList()
       })
     },
 
     methods: {
+      getGirdList() {
+        this.instance.post(`/app/appgirdmemberinfo/queryMyGirdListByLevel2?girdMemberId=${this.params.id}`).then(res => {
+          if (res.code == 0) {
+            this.girdList = res.data
+          }
+        })
+      },
       getList () {
         this.instance.post(`/app/appgirdmemberresident/listByGirdMember`, null, {
           params: {
@@ -184,6 +211,10 @@
       },
 
       onConfirm () {
+        if(!this.girdId) {
+          return this.$message.error('请选择网格')
+        }
+
         if (!this.chooseUser.length) {
           return this.$message.error('请选择户主')
         }
@@ -192,7 +223,8 @@
           return {
             girdMemberId: this.params.id,
             name: v.split('~')[0],
-            residentId: v.split('~')[1]
+            residentId: v.split('~')[1],
+            girdId: this.girdId
           }
         })
         this.instance.post(`/app/appgirdmemberresident/add`, {
@@ -219,7 +251,7 @@
             size: 200,
             con: this.name,
             householdName: 1,
-            areaId: this.areaId
+            areaId: this.areaId,
           }
         }).then(res => {
           if (res.code == 0) {