diff --git a/src/views/components/resiInfo.vue b/src/views/components/resiInfo.vue
index a4df68c01..057edf6cf 100644
--- a/src/views/components/resiInfo.vue
+++ b/src/views/components/resiInfo.vue
@@ -1,263 +1,166 @@
 <template>
-  <div 
+  <div
        class="g-main ">
-    <el-form 
-             class="resi-form m-search"
-             :model="form"
-             ref="formId"
+       <div class=" title-small title_postion" >基础信息 </div>
+    <el-form class="resi-form m-search"
              >
-             <el-form-item prop="gridId" :rules="rulesForm.gridId"
-                            label="所属组织" label-width="100px" >
-                  <el-select v-model.trim="form.gridId"
-                             placeholder="请选择网格"
-                             size="small"
-                             clearable
-                             class="u-item-width-normal"
-                             @change="handleChangeGrid">
-                    <el-option v-for="item in optionsG"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value">
-                    </el-option>
-                  </el-select>
-             
+             <el-form-item prop="gridId" class="f-w50" label="所属组织" label-width="100px" >
+                 <div >
+                  {{resiDetailList.houseInfo.gridName!=null?resiDetailList.houseInfo.gridName:'--'}}
+                 </div>
               </el-form-item>
-              <el-form-item label="所属房屋"
+              <el-form-item label="所属房屋" class="f-w50"
               label-width="100px">
                   <div class="f-flex">
-                    <el-form-item prop="villageId" class="u-item-width-communitycascader f-bto0" :rules="rulesForm.villageId" >
-                      <el-select v-model.trim="form.villageId"
-                                 placeholder="请选择小区"
-                                 size="small"
-                                 class="u-item-width-communitycascader f-bto0"
-                                 clearable
-                                 @change="handleChangeV">
-                        <el-option v-for="item in optionsV"
-                                   :key="item.value"
-                                   :label="item.label"
-                                   :value="item.value">
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item prop="buildId" :rules="rulesForm.buildId">
-                      <el-select v-model.trim="form.buildId"
-                                 placeholder="楼号"
-                                 size="small"
-                                 clearable
-                                 class="u-item-width-buildcascader f-bto0"
-                                 @change="handleChangeB">
-                        <el-option v-for="item in optionsB"
-                                   :key="item.value"
-                                   :label="item.label"
-                                   :value="item.value">
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item prop="unitId" :rules="rulesForm.unitId">
-                      <el-select v-model.trim="form.unitId"
-                                 placeholder="单元"
-                                 size="small"
-                                 clearable
-                                 class="u-item-width-buildcascader f-bto0"
-                                 @change="handleChangeD">
-                        <el-option v-for="item in optionsD"
-                                   :key="item.value"
-                                   :label="item.label"
-                                   :value="item.value">
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item prop="homeId" :rules="rulesForm.homeId">
-                      <el-select v-model.trim="form.homeId"
-                                 placeholder="房号"
-                                 size="small"
-                                 clearable
-                                 class="u-item-width-buildcascader f-bto0"
-                                 @change="handleChangeH">
-                        <el-option v-for="item in optionsH"
-                                   :key="item.value"
-                                   :label="item.label"
-                                   :value="item.value">
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                
-                
+                    {{resiDetailList.houseInfo.homeName?resiDetailList.houseInfo.homeName:'--'}}
                 </div>
               </el-form-item>
-              <el-form-item v-for="(item,index)  in basicInformation" :label-width="'100px'" :label="item.label" :key="index" :class="item.itemType=='textarea'?'textareaDidth':''" :rules="item.rules" :prop="item.formName" >
+
+              <el-form-item v-for="(item,index)  in basicInformation" :label-width="item.itemType!= 'title'?'100px':'24px'" :class="item.itemType != 'checkbox'?'f-w50':''" :label="item.label" :key="index" >
+
                   <template v-if="item.itemType == 'radio'" >
-                      <section class="u-item-width-normal">
-                        <el-radio v-for="ns in item.opction"
-                              :key="ns.value"
-                              size="small"
-                              v-model.trim="form[item.formName]"
-                              :label="ns.value"
-                           >
-                      {{ ns.label }}
-                    </el-radio>
+                      <section  v-if="item.formName == 'localResidenceFlag'">
+                        {{resiDetailList.localResidenceFlag?resiDetailList.localResidenceFlag == 1?'是':'否':'--'}}
+                      </section>
+                      <section  v-if="item.formName == 'gender'">
+                        {{resiDetailList.genderName?resiDetailList.genderName:'--'}}
                       </section>
                   </template>
-                  <template v-if="item.itemType == 'input'" >
-                    <el-input 
-                              clearable
-                              size="small"
-                              :placeholder="`请输入${item.label}`"
-                              v-model.trim="form[item.formName]"
-                              class="u-item-width-normal"  @blur="handleValidBlur(item)"
-                           >
-                    </el-input>
+
+                  <template v-if="item.itemType == 'input'"  >
+                   <section v-if="item.formName == 'name'">
+                    {{resiDetailList.name?resiDetailList.name:'--'}}
+                   </section>
+                   <section v-if="item.formName == 'mobile'">
+                    {{resiDetailList.showMobile?resiDetailList.showMobile:resiDetailList.mobile?`${resiDetailList.mobile.substr(0,3)}`+ "****" +`${resiDetailList.mobile.substr(7,5)}`:'--'}}
+                    <el-button v-if="resiDetailList.mobile"
+                       style="margin-left: 10px"
+                       type="text"
+                       class="div-table-button--blue"
+                       icon="el-icon-view"
+                       size="small"
+                       @click="handleTuomin('mobile')">显示</el-button>
+                   </section>
+                   <section v-if="item.formName == 'idNum'">
+                    {{resiDetailList.showIdNum?resiDetailList.showIdNum:resiDetailList.idNum?`${resiDetailList.idNum.substr(0, 11)}` +"******" +`${resiDetailList.idNum.substr(16, 2)}`:'--'}}
+               <el-button v-if="resiDetailList.idNum"
+                       style="margin-left: 10px"
+                       type="text"
+                       class="div-table-button--blue"
+                       icon="el-icon-view"
+                       size="small"
+                       @click="handleTuomin('idCard')">显示</el-button>
+                   </section>
+                   <section v-if="item.formName == 'remark'">
+                    {{resiDetailList.remark?resiDetailList.remark:'--'}}
+                   </section>
                   </template>
+
                   <template v-else-if="item.itemType == 'select'">
-                    <el-select
-                             v-model="form[item.formName]"
-                             :placeholder="`请选择${item.label}`"
-                             size="small"
-                             clearable
-                             class="u-item-width-normal">
-                    <el-option v-for="items in item.opction "
-                               
-                               :key="items.value"
-                               :label="items.label"
-                               :value="items.value">
-                    </el-option>
-                  </el-select>
+                    <section v-if="item.formName == 'nation'">
+                    {{resiDetailList.nationName?resiDetailList.nationName:'--'}}
+                   </section>
                   </template>
-                  <template v-else-if="item.itemType == 'textarea'">
-                             <el-input
-                              type="textarea"
-                              placeholder="请输入内容"
-                              class="item-width-textarea"
-                              maxlength="120"
-                              show-word-limit
-                              resize="none"
-                              rows="3"
-                              v-model.trim="form[item.formName]"
-                              
-                            >
-                            </el-input>
+
+                 <!-- <template v-else-if="item.itemType == 'title'" >
+                  <div class="f-font14 title-small f-m0" style="position: relative;left: -10px;">分类信息 </div>
+                 </template> -->
+                
+                  <template v-else-if="item.itemType == 'datepicker'"  :label="item.label">
+                    {{resiDetailList.birthday}}
                   </template>
                   <template v-else-if="item.itemType == 'checkbox'"  :label="item.label">
-                        <el-checkbox v-for="(items,indexs) in item.opction" style="width:70px" :key="indexs" :label="items.label" :true-label="'1'" :false-label="'0'" 
-                        size="small"
-                        v-model="form[items.formName]"
-                        @change="val => handleChangeCheckbox(val,items)"
-                        >
-                        </el-checkbox>   
+                   <!-- 222 -->
                   </template>
-                  <template v-else-if="item.itemType == 'datepicker'"  :label="item.label">
-                    <el-date-picker
-                                  v-model.trim="form.birthday"
-                                  class="u-item-width-normal"
-                                  type="date"
-                                  size="small"
-                                  clearable
-                                  placeholder="选择日期"
-                                  format="yyyy 年 MM 月 dd 日"
-                                  value-format="yyyy-MM-dd">
-                  </el-date-picker>
-                  </template>
-                  
               </el-form-item>
+              <!-- <el-row>分类信息 </el-row> -->
+                  <!-- <template :label="item.label">
+                        <section >
+                            <div v-for="items in item.opction" style="width:90px;display: inline-block;"  v-show="resiDetailList.categoryInfo?resiDetailList.categoryInfo[items.formName]!=0:'' ||resiDetailList.categoryInfo?resiDetailList.categoryInfo[items.formName]!=null:''">
+                                <span >{{items.label}}</span>
+                            </div>
+                        </section>
+                  </template> -->
               <!-- 这里开始就是底部的input了------------------------------------------------------------------->
+              <!-- <div class="title-small title_postion">其他信息 </div> -->
               <el-tabs v-model="activeName"
                           @tab-click="handleClick">
                     <el-tab-pane v-for="item in tabsList"
                                 :key="item.groupId"
                                 :label="item.label"
                                 :name="'group' + item.groupId">
-                        <template v-for="itemj in footerInputList"  >
-                            <section v-if="item.groupId == itemj.id" class="f-flex" style="flex-wrap: wrap;">
-                              <el-form-item  v-for="(itemk,index) in itemj.children" :key="index" label-width="100px" :label="itemk.label" :class="itemk.itemType=='textarea'?'textareaDidth':''" >
-                                  <template v-if="itemk.itemType == 'radio1'" >
-                                      <section class="u-item-width-normal" >
-                                        <el-radio 
-                                              v-for="ns in itemk.opction"
-                                              :key="ns.value"
-                                              size="small"
+                            <template v-for="itemj in footerInputList"  >
+                              <section v-if="item.groupId  == itemj.id" class="f-flex" style="flex-wrap: wrap;">
+                                <el-form-item  v-for="(itemk,index) in itemj.children" :key="index" label-width="100px" :label="itemk.label" :class="itemk.itemType=='textarea'?'textareaDidth':''" >
+                                    <template v-if="itemk.itemType == 'radio1'" >
+                                        <section class="u-item-width-normal" >
+                                          <el-radio
+                                                v-for="ns in itemk.opction"
+                                                :key="ns.value"
+                                                size="small"
+                                                v-model.trim="form[itemj.id][itemk.formName]"
+                                                :label="ns.value"
+                                            >
+                                        {{ ns.label }}
+                                      </el-radio>
+                                        </section>
+                                    </template>
+                                    <template v-else-if="itemk.itemType=='select1'" >
+                                             <div v-if="item.groupId=='eduInfoDto'">
+                                               <div >
+                                                  {{ eduInfoDtoList == []?eduInfoDtoList.cultureLevel:'--'}}
+                                               </div>
+                                             </div>
+                                     </template>
+                                    <template v-else-if="itemk.itemType=='textarea1'" >
+                                      {{eduInfoDtoList == []?eduInfoDtoList.eduRemark:'--'}}
+                                    </template>
+                                    <template v-else-if="itemk.itemType=='input1'" >
+                                              <el-input
+                                              :placeholder="`请输入${itemk.label}`"
+                                              class="u-item-width-normal"
+                                              :style="{'margin-right':itemk.label == '备注'?'50px':''}"
                                               v-model.trim="form[itemj.id][itemk.formName]"
-                                              :label="ns.value"
-                                          >
-                                      {{ ns.label }}
-                                    </el-radio>
-                                      </section>
-                                  </template>
-                                  <template v-else-if="itemk.itemType=='select1'" >
-                                            <el-select
-                                            v-model="form[itemj.id][itemk.formName]"
-                                                  :placeholder="`请选择${itemk.label}`"
-                                                  size="small"
-                                                  :multiple="itemk.formName=='specialCategoryCode'" 
-                                                  :collapse-tags="itemk.formName=='specialCategoryCode'"
-                                                  clearable
-                                                  class="u-item-width-normal">
-                                                <el-option v-for="items in itemk.opction"
-                                                    :key="items.value"
-                                                    :label="items.label"
-                                                    :value="items.value">
-                                                    
-                                                </el-option>
-                                            </el-select>  
-                                   </template>
-                                  <template v-else-if="itemk.itemType=='textarea1'" >
-                                            <el-input
-                                            type="textarea"
-                                            :placeholder="`请输入${itemk.label}`"
-                                            class="item-width-textarea"
-                                            maxlength="120"
-                                            show-word-limit
-                                            resize="none"
-                                            rows="3"
-                                            v-model.trim="form[itemj.id][itemk.formName]"
-                                          >
-                                         </el-input>
+                                              clearable
+                                            >
+                                           </el-input>
+                                    </template>
+                                    <template  v-else-if="itemk.itemType=='checkbox'" >
+
+                                      <el-checkbox-group
+                                        size="small"
+                                        v-model="form[itemj.id][itemk.formName]"
+                                      >
+                                          <el-checkbox v-for="items in itemk.opction" :label="items.label != itemk.label? items.label :''"  :style="{'margin-right':items.label != itemk.label? '' :'19px'}"   :key="items.label" ></el-checkbox>
+                                      </el-checkbox-group>
+                                    </template>
+                                    <template v-else-if="itemk.itemType == 'datepicker1'">
+                                        <el-date-picker
+                                                      v-model.trim="form[itemj.id][itemk.formName]"
+                                                      class="u-item-width-normal"
+                                                      type="date"
+                                                      size="small"
+                                                      clearable
+                                                      placeholder="选择日期"
+                                                      format="yyyy 年 MM 月 dd 日"
+                                                      value-format="yyyy-MM-dd">
+                                      </el-date-picker>
                                   </template>
-                                  <template v-else-if="itemk.itemType=='input1'" >
-                                            <el-input
-                                            :placeholder="`请输入${itemk.label}`"
-                                            class="u-item-width-normal"
-                                            :style="{'margin-right':itemk.label == '备注'?'50px':''}"
-                                            v-model.trim="form[itemj.id][itemk.formName]"
-                                            clearable
-                                          >
-                                         </el-input>
+                                  <template v-else-if="itemk.itemType == 'cascader1'">
+                                    <el-cascader
+                                                :props="{ emitPath: false }"
+                                                :options="itemk.opction"
+                                                clearable
+                                                size="small"
+
+                                                ></el-cascader>
                                   </template>
-                                  <template  v-else-if="itemk.itemType=='checkbox'" >
-                                  
-                                    <el-checkbox-group 
-                                      size="small"
-                                      v-model="form[itemj.id][itemk.formName]"
-                                    >
-                                        <el-checkbox v-for="items in itemk.opction" :label="items.label != itemk.label? items.label :''"  :style="{'margin-right':items.label != itemk.label? '' :'19px'}"   :key="items.label" ></el-checkbox>
-                                    </el-checkbox-group>   
+                                  <template v-else-if="itemk.itemType == 'number'">
+                                    <el-input-number class="u-item-width-normal" :min="1" :max="10" :label="itemk.label"></el-input-number>
                                   </template>
-                                  <template v-else-if="itemk.itemType == 'datepicker1'">
-                                      <el-date-picker
-                                                    v-model.trim="form[itemj.id][itemk.formName]"
-                                                    class="u-item-width-normal"
-                                                    type="date"
-                                                    size="small"
-                                                    clearable
-                                                    placeholder="选择日期"
-                                                    format="yyyy 年 MM 月 dd 日"
-                                                    value-format="yyyy-MM-dd">
-                                    </el-date-picker>
-                                </template>
-                                <template v-else-if="itemk.itemType == 'cascader1'">
-                                  <el-cascader
-                                              :props="{ emitPath: false }"
-                                              :options="itemk.opction"
-                                              clearable
-                                              size="small"
-
-                                              ></el-cascader>
-                                </template>
-                                <template v-else-if="itemk.itemType == 'number'">
-                                  <el-input-number class="u-item-width-normal" :min="1" :max="10" :label="itemk.label"></el-input-number>
-                                </template>
-                              </el-form-item>
-                            </section>
-                        </template>       
+                                </el-form-item>
+                              </section>
+                          </template>
                     </el-tab-pane>
               </el-tabs>
     </el-form>
@@ -267,20 +170,21 @@
 <script>
 import { isCard, isPassport, isMobile, isPhone } from '@/utils/validate'
 import { computedCard } from '@/utils/index'
-
+import { requestPost, requestGet } from '@/js/dai/request'
 export default {
   name: 'resiForm',
   props: {
-    formId: {
+    resiId: {
         type: String,
-        default: 'resiForm'
       },
+
   },
   data () {
    return {
     optionsV: [],
     optionsB: [],
     optionsH: [],
+    resiDetailList:{},
     optionsD: [],
     optionsG: [],
     activeName: 'groupeduInfoDto',
@@ -303,7 +207,7 @@ export default {
       formName:"name",
       rules:[{required:true,message:'居民姓名不能为空',trigger:'blur'}],
       opction:[
-        
+
       ],
     },
     {
@@ -311,7 +215,7 @@ export default {
       itemType:"input",
       formName:"mobile",
       opction:[
-        
+
       ],
     },
     {
@@ -328,7 +232,7 @@ export default {
          },trigger:'change' | blur }
     ],
       opction:[
-        
+
       ],
     },{
       label:"性别",
@@ -350,13 +254,13 @@ export default {
       formName:'birthday'
     },{
       label:'备注',
-      itemType:"textarea",
+      itemType:"input",
       formName:'remark'
     },{
       label:'居民分类',
       itemType:"checkbox",
-      opction:[{label:'党员',value:'0', formName:"partyFlag",},{label:'低保人员',value:'0', formName:"subsistenceAllowanceFlag	",},{label:'保障房人员',value:'0', formName:"ensureHouseFlag",},{label:'失业人员',value:'0', formName:"unemployedFlag",},{label:'育龄妇女',value:'0', formName:"fertileWomanFlag",},{label:'退役军人',value:'0', formName:"veteranFlag",},{label:'统战人员',value:'0', formName:"unitedFrontFlag",},{label:'信访人员',value:'0', formName:"petitionOfficerFlag",},{label:'志愿者',value:'0', formName:"volunteerFlag",},{label:'失独人员',value:'0', formName:"bereavedPersonFlag",},{label:'租户',value:'0', formName:"tenantFlag",},{label:'流动人口',value:'0', formName:"floatingFlag",},{label:'特殊人群',value:'0', formName:"specialCrowdFlag",},{label:'老年人',value:'0', formName:"oldPeopleFlag",},{label:'空巢老人',value:'0', formName:"emptyNesterFlag",},{label:'独居老人',value:'0', formName:"liveAloneFlag",},{label:'失能老人',value:'0', formName:"disabledFlag",},{label:'失智老人',value:'0', formName:"dementedFlag",},{label:'残疾',value:'0', formName:"disabilityFlag",},{label:'大病',value:'0', formName:"seriousIllnessFlag",},{label:'慢病',value:'0', formName:"chronicDiseaseFlag",}]
-    }
+      opction:[{label:'党员',value:'0', formName:"partyFlag",},{label:'低保人员',value:'0', formName:"subsistenceAllowanceFlag",},{label:'保障房人员',value:'0', formName:"ensureHouseFlag",},{label:'失业人员',value:'0', formName:"unemployedFlag",},{label:'育龄妇女',value:'0', formName:"fertileWomanFlag",},{label:'退役军人',value:'0', formName:"veteranFlag",},{label:'统战人员',value:'0', formName:"unitedFrontFlag",},{label:'信访人员',value:'0', formName:"petitionOfficerFlag",},{label:'志愿者',value:'0', formName:"volunteerFlag",},{label:'失独人员',value:'0', formName:"bereavedPersonFlag",},{label:'租户',value:'0', formName:"tenantFlag",},{label:'流动人口',value:'0', formName:"floatingFlag",},{label:'特殊人群',value:'0', formName:"specialCrowdFlag",},{label:'老年人',value:'0', formName:"oldPeopleFlag",},{label:'空巢老人',value:'0', formName:"emptyNesterFlag",},{label:'独居老人',value:'0', formName:"liveAloneFlag",},{label:'失能老人',value:'0', formName:"disabledFlag",},{label:'失智老人',value:'0', formName:"dementedFlag",},{label:'残疾',value:'0', formName:"disabilityFlag",},{label:'大病',value:'0', formName:"seriousIllnessFlag",},{label:'慢病',value:'0', formName:"chronicDiseaseFlag",}]
+    },
     ],
     // 底部input
     footerInputList:[
@@ -366,7 +270,7 @@ export default {
       itemType:"select1",
       formName:"cultureLevel",
       opction:[
-        
+
       ]},
       {
        label:"备注",
@@ -411,7 +315,7 @@ export default {
       itemType:"input1",
       formName:"religion",
       opction:[
-       
+
       ]},
       {
        label:"备注",
@@ -485,28 +389,28 @@ export default {
       itemType:"select1",
       formName:"illnessCode",
       opction:[
-        
+
       ]},
       {
        label:"大病患病时间",
       itemType:"datepicker1",
       formName:"illnessTime",
       opction:[
-        
+
       ]},
       {
        label:"所患慢性病",
       itemType:"select1",
       formName:"chronicDiseaseCode",
       opction:[
-        
+
       ]},
       {
        label:"慢病患病时间",
       itemType:"datepicker1",
       formName:"chronicDiseaseTime",
       opction:[
-        
+
       ]},
       {
        label:"是否参保",
@@ -533,7 +437,7 @@ export default {
       itemType:"datepicker1",
       formName:"deliveranceTime",
       opction:[
-        
+
       ]},
       {
        label:"享受救助明细序号",
@@ -555,7 +459,7 @@ export default {
       itemType:"input1",
       formName:"workUnit",
       opction:[
-       
+
       ]},
       {
        label:"职业",
@@ -584,7 +488,7 @@ export default {
       itemType:"input1",
       formName:"retirementAmount",
       opction:[
-      ]}, 
+      ]},
       {
        label:"月收入",
       itemType:"input1",
@@ -600,19 +504,19 @@ export default {
       itemType:"input1",
       formName:"nativePlace",
       opction:[
-      ]}, 
+      ]},
       {
        label:"户籍所在地",
       itemType:"input1",
       formName:"placeOfDomicile",
       opction:[
-      ]}, 
+      ]},
       {
        label:"现居住地址",
       itemType:"input1",
       formName:"currentResidence",
       opction:[
-      ]}, 
+      ]},
       {
        label:"人户状况",
       itemType:"select1",
@@ -640,13 +544,13 @@ export default {
       itemType:"select1",
       formName:"resideSituation",
       opction:[
-      ]}, 
+      ]},
       {
        label:"婚姻状况",
       itemType:"select1",
       formName:"marriage",
       opction:[
-      ]}, 
+      ]},
       {
        label:"配偶情况",
       itemType:"select1",
@@ -693,13 +597,13 @@ export default {
       itemType:"datepicker1",
       formName:"positiveTime",
       opction:[
-      ]}, 
+      ]},
       {
        label:"所属支部",
       itemType:"cascader1",
       formName:"branchId",
       opction:[
-      ]}, 
+      ]},
       {
        label:"流动党员",
       itemType:"radio1",
@@ -713,7 +617,7 @@ export default {
       itemType:"input1",
       formName:"flowActNum",
       opction:[
-        
+
       ]},
        {
        label:"职务",
@@ -740,7 +644,7 @@ export default {
       itemType:"input1",
       formName:"joinBranchName",
       opction:[
-        
+
       ]},{
        label:"组织关系转入社区时间",
       itemType:"datepicker1",
@@ -758,13 +662,13 @@ export default {
     },{
       id:'ensureHouseDto',
       children:[
-      
+
       {
        label:"住房性质",
       itemType:"select1",
       formName:"housingNature",
       opction:[
-      ]}, 
+      ]},
       {
        label:"保障类型",
       itemType:"input1",
@@ -775,13 +679,13 @@ export default {
       itemType:"datepicker1",
       formName:"certificateDate",
       opction:[
-      ]}, 
+      ]},
       {
        label:"补贴编号",
       itemType:"input1",
       formName:"subsidyNum",
       opction:[
-        
+
       ]},
        {
        label:"补贴金额	",
@@ -797,7 +701,7 @@ export default {
        label:"原工作单位",
       itemType:"input1",
       formName:"originWorkUnit",
-      }, 
+      },
       {
        label:"失业时间",
       itemType:"datepicker1",
@@ -810,13 +714,13 @@ export default {
       itemType:"input1",
       formName:"unemploymentNum",
       opction:[
-      ]}, 
+      ]},
       {
        label:"再就业优惠证号",
       itemType:"input1",
       formName:"employmentNum",
       opction:[
-        
+
       ]},
        {
        label:"技术特长",
@@ -850,31 +754,31 @@ export default {
       itemType:"datepicker1",
       formName:"joinArmyTime",
       opction:[
-      ]}, 
+      ]},
       {
        label:"退伍时间",
       itemType:"datepicker1",
       formName:"leaveArmyTime",
       opction:[
-      ]}, 
+      ]},
       {
        label:"服役单位",
       itemType:"input1",
       formName:"serviceUnit",
       opction:[
-      ]}, 
+      ]},
       {
        label:"接收单位",
       itemType:"input1",
       formName:"receiveUnit	",
       opction:[
-      ]}, 
+      ]},
       {
        label:"待安置补助金",
       itemType:"input1",
       formName:"settlementAmount",
       opction:[
-        
+
       ]},
        {
        label:"培训状况",
@@ -960,13 +864,11 @@ export default {
         opction:[]
       },]
     }
-    
-    ],
 
+    ],
     form:{
           agencyName:this.$store.state.user.agencyName,
           agencyId:this.$store.state.user.agencyId,
-          gridName:'',
           gridId:'', //所属网格id
           villageId: '', //小区id
           buildId: '', //楼栋id
@@ -1036,37 +938,37 @@ export default {
           },
           workInfoDto:{ //工作
             workUnit:'',//工作单位
-            occupation:'',//职业	
-            retireTime:'',//离退休时间		
-            workRemark:'',//备注		
+            occupation:'',//职业
+            retireTime:'',//离退休时间
+            workRemark:'',//备注
           },
           economyDto:{//经济
-            retirementAmount:'',//退休金额	
+            retirementAmount:'',//退休金额
             monthIncome:'',//月收入
           },
           resideInfoDto:{//居住信息
             nativePlace:'',//籍贯
-            placeOfDomicile:'',//户籍所在地	
-            currentResidence:'',//现居住地	
+            placeOfDomicile:'',//户籍所在地
+            currentResidence:'',//现居住地
             householdSituation:'',//人户情况，字典code
             resiRemark:'',//备注
           },
           familyInfoDto:{//家庭
-            houseHolderRel:'',//与户主关系	
-            resideSituation:'',//居住情况		
-            marriage:'',//婚姻状况		
-            spouseSituation:'',//配偶情况		
-            elderlyFlag:null,//有无赡养人【有:1 无:0】		
-            elderlyRelation:'',//与赡养人关系【字典表】		
-            dependantMobile:'',//赡养人联系电话			
-            familyInfoRemark:'',//备注		
+            houseHolderRel:'',//与户主关系
+            resideSituation:'',//居住情况
+            marriage:'',//婚姻状况
+            spouseSituation:'',//配偶情况
+            elderlyFlag:null,//有无赡养人【有:1 无:0】
+            elderlyRelation:'',//与赡养人关系【字典表】
+            dependantMobile:'',//赡养人联系电话
+            familyInfoRemark:'',//备注
           },
           parymemberInfoDto:{//党员信息
             joinTime:'',//入党时间yyyy-MM-dd
-            positiveTime:'',//转正时间yyyy-MM-dd	
-            branchId:'',//所属支部	
-            flowFlag:null,//是否流动党员：1是，0否	
-            flowActNum:'',//流动党员活动证号	
+            positiveTime:'',//转正时间yyyy-MM-dd
+            branchId:'',//所属支部
+            flowFlag:null,//是否流动党员：1是，0否
+            flowActNum:'',//流动党员活动证号
             partyJob:'',//职务，字典code
             retiredFlag:null,//是否退休：1是，0否
             centerFlag:null,//是否党员中心户：1是，0否
@@ -1076,47 +978,47 @@ export default {
           },
           ensureHouseDto:{//保障房信息
             housingNature:'',//住房性质，字典code
-            securityType:'',//保障类型	
+            securityType:'',//保障类型
             certificateDate:'',//发证日期yyyy-MM-dd
-            subsidyNum:'',//补贴编号	
-            subsidyAmount:'',//补贴金额	
+            subsidyNum:'',//补贴编号
+            subsidyAmount:'',//补贴金额
           },
           unemployedDto:{//失业信息
             originWorkUnit:'',//原工作单位
-            unemploymentTime:'',//失业时间yyyy-MM-dd	
-            unemploymentNum:'',//失业证号	
-            employmentNum:'',//再就业优惠证号	
-            specialSkill:'',//技术特长	
-            unemploymentReason:'',//失业原因【字典表】code	
-            employmentHardFlag:null,//是否就业困难对象；1是0不是	
-            employmentWish:'',//劳动能力就业愿望	
+            unemploymentTime:'',//失业时间yyyy-MM-dd
+            unemploymentNum:'',//失业证号
+            employmentNum:'',//再就业优惠证号
+            specialSkill:'',//技术特长
+            unemploymentReason:'',//失业原因【字典表】code
+            employmentHardFlag:null,//是否就业困难对象；1是0不是
+            employmentWish:'',//劳动能力就业愿望
           },
           veteranDto:{//退役军人
             joinArmyTime:'',//入伍时间
             leaveArmyTime:'',//退伍时间
-            serviceUnit:'',//服役单位	
-            receiveUnit:'',//接收单位	
-            settlementAmount:'',//待安置补助金	
-            trainDesc:'',//培训状况	
-            employmentSituation:'',//现就业情况	
-            joinWarStartTime:'',//参战时间开始日期yyyy-MM-dd	
-            joinWarEndTime:'',//参战时间截止日期yyyy-MM-dd	
+            serviceUnit:'',//服役单位
+            receiveUnit:'',//接收单位
+            settlementAmount:'',//待安置补助金
+            trainDesc:'',//培训状况
+            employmentSituation:'',//现就业情况
+            joinWarStartTime:'',//参战时间开始日期yyyy-MM-dd
+            joinWarEndTime:'',//参战时间截止日期yyyy-MM-dd
             pubWelfareJobFlag:null,//是否办理公益性岗位;1是0否
           },
           unitedFrontDto:{//统战人员
             duty:'',//职务
-            visitation:'',//探亲情况	
+            visitation:'',//探亲情况
           },
-          volunteerDto:{//志愿者信息	
+          volunteerDto:{//志愿者信息
             volunteerCategory:[],//志愿者类别
             volunteerRemark:''//备注
 
           },
           oldPeopleDto:{
-            oldSubsidy:''//高龄补助	
+            oldSubsidy:''//高龄补助
           },
           specialDto:{//特殊人群
-            specialCategoryCode:[]//人群类别【字典表】,可多选，以英文逗号隔开；	
+            specialCategoryCode:[]//人群类别【字典表】,可多选，以英文逗号隔开；
           }
     },
     rulesForm: {
@@ -1129,16 +1031,26 @@ export default {
     },
     // 底部tabs选项
     tabsList:[
-      {groupId:'eduInfoDto',label:'教育'},{groupId:'hobbyInfoDto',label:'兴趣爱好'},{groupId:'religionDto',label:'宗教信仰'},{groupId:'healthDto',label:'健康'},{groupId:'workInfoDto',label:'工作'},{groupId:'economyDto',label:'经济情况'},{groupId:'resideInfoDto',label:'居住'},{groupId:'familyInfoDto',label:'家庭'},
-    ]
+      {groupId:'eduInfoDto',label:'教育信息'},{groupId:'hobbyInfoDto',label:'兴趣爱好'},{groupId:'religionDto',label:'宗教信仰'},{groupId:'healthDto',label:'健康'},{groupId:'workInfoDto',label:'工作'},{groupId:'economyDto',label:'经济情况'},{groupId:'resideInfoDto',label:'居住'},{groupId:'familyInfoDto',label:'家庭'},{groupId:'parymemberInfoDto',label:'党员信息'},{label:'保障房信息',groupId:'ensureHouseDto'},{label:'失业',id:'2',groupId:'unemployedDto'},{label:'退役军人',id:'3',groupId:'veteranDto'},{label:'统战',id:'4',groupId:'unitedFrontDto'},{label:'志愿者信息',id:'5',groupId:'volunteerDto'},{label:'老年人',id:'6',groupId:'oldPeopleDto'},{label:'特殊人群',id:'7',groupId:'specialDto'},{label:'出生人员',id:'7',groupId:'BirthRecord'},{label:'死亡人员',id:'7',groupId:'dentDeathRecord'},{label:'迁出信息',id:'7',groupId:'dentMoveOutRecord'}
+    ],
+    eduInfoDtoList:[]
    }
   },
   computed: {
+    // filterList(item){
+    //   let arr = []
+    //   if(this.resiDetailList.categoryInfo){
+    //     for (const key in item) {
+    //       console.log(key);
+    //     }
+    //   }
+    //   return arr
+    // }
   },
   watch: {
     form:{
     handler (val, val2) {
-      
+
     },
       deep:true,
       immediate:true
@@ -1146,8 +1058,7 @@ export default {
   },
   created () {
     this.getGridList()
- 
-    this.getAllNation()
+    this.getResiDetail()
   },
   methods: {
 
@@ -1156,7 +1067,7 @@ export default {
       this.$refs.formId.validate(v=>{
         this.validateFlag = v
         flag = v
-       
+
       })
       if(flag){
           return this.form
@@ -1184,6 +1095,35 @@ export default {
     this.getPartyNation()
     this.getResidentNation()
     this.getHousing()
+    },
+    async handleTuomin (type) {
+      const url = "/data/aggregator/epmetuser/detailByType";
+
+      const { data, code, msg } = await requestPost(url, {
+        id: this.resiId,
+        type: "checkIcResiUser",
+      });
+      if (code === 0) {
+        if (type === 'mobile') {
+          this.$set(this.resiDetailList, 'showMobile', data.mobile)
+        }
+        if (type === 'idCard') {
+          this.$set(this.resiDetailList, 'showIdNum', data.idCard)
+        }
+
+
+      } else {
+        this.$message.error(msg);
+      }
+
+    },
+    getResiDetail(){
+      this.$http.post(`/actual/base/residentBaseInfo/detail/${this.resiId}`).then(res=>{
+      this.resiDetailList = res.data.data
+     }).catch(err =>{
+        console.log(err);
+     })
+
     },
       getGridList () {
         const { user } = this.$store.state
@@ -1221,7 +1161,7 @@ export default {
       try {
         const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'disability_category_code'})
         this.footerInputList.forEach(c => {
-        
+
           for(let i of c.children){
               if(i.formName == 'disabilityCategoryCode'){
                   i.opction = data.data
@@ -1232,13 +1172,12 @@ export default {
       } catch (error) {
         console.log(error,'获取残疾字典');
       }
-
       },
       async  getdisabilityNationClass(){
       try {
         const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'disability_level'})
         this.footerInputList.forEach(c => {
-       
+
           for(let i of c.children){
               if(i.formName == 'disabilityLevel'){
                   i.opction = data.data
@@ -1265,7 +1204,7 @@ export default {
       } catch (error) {
         console.log(error,'获取所患大病字典');
       }
-      }, 
+      },
        async  getchronicNation(){
         try {
           const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'chronic_disease_code'})
@@ -1446,29 +1385,12 @@ export default {
                 if(i != item.id){
                   this.tabsList = this.tabsList.filter(items=>items.id!=i)
                 }
-            }) 
+            })
             }
        }
-       
-      },
-      handleChangeGrid (val) {
-        console.log('val', val)
-        for(let n of this.optionsG){
-           if(n.value == val){
-            this.form.gridName = n.label
-           }
-        }
-        this.form.villageId = ''
-        this.form.buildId = ''
-        this.form.unitId = ''
-        this.form.homeId = ''
-        this.getValiheList()
-        if (!val) {
-          this.getBuildList()
-          this.getUniList()
-          this.getHouseList()
-        }
+
       },
+
       validateIdcard (idCard, type) {
         this.$http
           .post('/epmetuser/icresiuser/getUserRoleByIdCard', { idCard })
@@ -1477,10 +1399,10 @@ export default {
               return this.$message.error(res.msg)
             } else {
               console.log('获取查询详情成功', res.data)
-  
+
               if (res.data.isVolunteer == '1') this.form.volunteerFlag = true
               else this.form.volunteerFlag = false
-  
+
               if (res.data.isPartyMember == '1') {
                 this.form.partyFlag = true
                 this.isParty = true
@@ -1492,30 +1414,6 @@ export default {
             return this.$message.error('网络错误')
           })
       },
-      // 身份证号失去焦点事件
-      handleValidBlur (item) {
-          console.log('n---', item)
-          if (item.formName !== 'idNum') return
-          if (!isCard(this.form.idNum) && !isPassport(this.form.idNum)) return
-          const { user } = this.$store.state
-          let huji = '', i = 0
-          if (user.areaCodePath && user.areaCodePath.length > 0) {
-              i = user.areaCodePath.length - 1
-              huji = user.areaCodePath[i].length > 6 ? user.areaCodePath[i].substr(0, 6) : user.areaCodePath[i]
-          }
-
-          if (this.form.idNum.length === 18 || this.form.idNum.length === 15) {
-              const _id = this.form.idNum.substr(0, 6)
-              const { sex, birth, age } = computedCard(this.form.idNum)
-              this.form.birthday = birth
-              this.form.gender = sex == 1 ? '1' : '2'
-              this.form.oldPeopleFlag = age >= 60 ? 1 : 0
-              // this.form.IS_BDHJ = huji == _id ? '1' : ''
-              this.validateIdcard(this.form.idNum)
-              console.log('age-----', age, _id)
-          }
-
-  },
       handleChangeV (val) {
         console.log('val', val)
         this.form.buildId = ''
@@ -1537,6 +1435,23 @@ export default {
         this.getHouseList()
       },
       handleClick (tab, event) {
+        if(tab.index==0){
+          this.getEduInfoDto()
+        }
+      },
+      // 获取教育信息详情
+     async getEduInfoDto(){
+       try {
+        console.log(this.resiId);
+        const {data} = await this.$http.get(`/actual/base/residentEduInfo/detail/${this.resiId}`)
+       if(data.data == null){
+         this.eduInfoDtoList = []
+       }else{
+        this.eduInfoDtoList = data.data
+       }
+       } catch (error) {
+        console.log(error);
+       }
       },
       handleForm () {
         let newForm = []
@@ -1611,7 +1526,7 @@ export default {
         const { data } = await this.$http.post('sys/dict/data/relationship',{formCode: "resi_base_info"})
         this.footerInputList.forEach(c => {
           for(let i of c.children){
-              if(i.formName == 'houseHolderRel' ||i.formName == 'elderlyRelation' ){ 
+              if(i.formName == 'houseHolderRel' ||i.formName == 'elderlyRelation' ){
                   i.opction = data.data
               }
           }
@@ -1627,7 +1542,7 @@ export default {
         const { data } = await this.$http.post('resi/partymember/icPartyOrg/branchlist',{formCode: "resi_base_info"})
         this.footerInputList.forEach(c => {
           for(let i of c.children){
-              if(i.formName == 'branchId' ){ 
+              if(i.formName == 'branchId' ){
                   i.opction = data.data
               }
           }
@@ -1652,7 +1567,7 @@ export default {
       });
       return arr;
     },
-   
+
       async  getEducation(){
       try {
         let { data } = await this.$http.post('sys/dict/data/education',{formCode: "resi_base_info"})
@@ -1717,6 +1632,17 @@ export default {
     display: flex;
   }
 }
+.f-w50{
+  width: 50%;
+}
+.title_postion{
+  position: relative;
+  top: -20px;
+}
+.downLabel{
+  display: inline-block;
+  width: 70px;
+}
 .m-search{
   padding: 0 !important;
   margin: 0 !important;
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 5c52060e1..6c5e20478 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -730,21 +730,19 @@ export default {
             return this.$message.error('网络错误')
           })
       },
-      // 这个接口之前多个传什么
+      
     getValiheList() {
       const { user } = this.$store.state
       var agencyIdTemp = ''
       if(this.form.agencyId.length == 0) {
         agencyIdTemp = ''
       } else {
-        this.form.agencyId.forEach(element => {
-          agencyIdTemp =this.form.agencyId + ',' + element
-        });
+          agencyIdTemp = this.form.agencyId.join(',')
       }
       this.$http
         .post('/gov/org/icneighborhood/neighborhoodoption', { 
           gridId: this.GRID_ID,
-          agencyId: agencyIdTemp	,
+          agencyId: agencyIdTemp,
           // agencyId: user.agencyId
         })
         .then(({ data: res }) => {
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index bc68b6318..e531f4252 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -372,7 +372,6 @@
           ref="resiInfo"
           :fixed="true"
           :resi-id="lookResiId"
-          :resiDetailList='resiDetailList'
         />
       </div>
 
@@ -848,14 +847,7 @@ export default {
         this.selAllFlag = false;
       }
     },
-    getResiDetail(id){
-      this.$http.post(`/actual/base/residentBaseInfo/detail/${id}`).then(res=>{
-      this.resiDetailList = res.data.data
-     }).catch(err =>{
-        console.log(err);
-     })
-    
-    },
+
     deleteBatch() {
       if (this.selection.length > 0) {
         this.$confirm("删除之后无法恢复，确认删除？", "提示", {
@@ -901,7 +893,7 @@ export default {
     },
 
     resetSearchForm(formName) {
-      for(const n in this.form) {
+      for(const n in this.$refs.myResiSearch.form) {
         this.$refs.myResiSearch.form[n] = ''
       }
       this.getTableData();
@@ -1104,7 +1096,6 @@ export default {
     async handleLook(row) {
       this.lookResiId = row.resiId;
       this.dialogVisible2 = true;
-      this.getResiDetail(row.resiId)
     },
 
     // 编辑
@@ -1382,8 +1373,6 @@ export default {
         pageSize: this.pageSize,
         ...obj
       };
-
-      console.log('1369->>>>>>>>>>>>',params);
       this.tableLoading = true;
       const { data, code, msg } = await requestPost(
         "/actual/base/residentBaseInfo/page",