diff --git a/.env.development b/.env.development
index c26b481d7..5db66bc54 100644
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,6 @@
 NODE_ENV=development
 
-VUE_APP_API_SERVER =  http://192.168.1.140/api
+VUE_APP_API_SERVER =  http://192.168.1.144/api
 # VUE_APP_API_SERVER =  http://118.190.150.119:41080/api
 # VUE_APP_API_SERVER =  https://epmet-yantai.elinkservice.cn/api
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss
index 00bfa22b9..1c9e5fd72 100644
--- a/src/assets/scss/modules/management/list-main.scss
+++ b/src/assets/scss/modules/management/list-main.scss
@@ -225,7 +225,9 @@
 .f-right8 {
   margin-right: 8px !important;
 }
-
+.f-right10 {
+  margin-right: 10px !important;
+}
 .f-margin30 {
   margin: 30px;
 }
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index b7a7cc6b8..b4160827d 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -4,12 +4,11 @@
     <el-form 
              class="resi-form m-search"
              :model="form"
-             :rules="rulesForm"
-             :ref="formId"
+             ref="formId"
              >
-             <el-form-item prop="GRID_ID"
-                            label="所属组织" label-width="100px" required>
-                  <el-select v-model.trim="form.GRID_ID"
+             <el-form-item prop="gridId" :rules="rulesForm.gridId"
+                            label="所属组织" label-width="100px" >
+                  <el-select v-model.trim="form.gridId"
                              placeholder="请选择网格"
                              size="small"
                              clearable
@@ -24,10 +23,10 @@
              
               </el-form-item>
               <el-form-item label="所属房屋"
-                            required label-width="100px">
+              label-width="100px">
                   <div class="f-flex">
-                    <el-form-item prop="VILLAGE_ID" class="u-item-width-communitycascader f-bto0">
-                      <el-select v-model.trim="form.VILLAGE_ID"
+                    <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"
@@ -40,8 +39,8 @@
                         </el-option>
                       </el-select>
                     </el-form-item>
-                    <el-form-item prop="BUILD_ID">
-                      <el-select v-model.trim="form.BUILD_ID"
+                    <el-form-item prop="buildId" :rules="rulesForm.buildId">
+                      <el-select v-model.trim="form.buildId"
                                  placeholder="楼号"
                                  size="small"
                                  clearable
@@ -54,8 +53,8 @@
                         </el-option>
                       </el-select>
                     </el-form-item>
-                    <el-form-item prop="UNIT_ID">
-                      <el-select v-model.trim="form.UNIT_ID"
+                    <el-form-item prop="unitId" :rules="rulesForm.unitId">
+                      <el-select v-model.trim="form.unitId"
                                  placeholder="单元"
                                  size="small"
                                  clearable
@@ -68,8 +67,8 @@
                         </el-option>
                       </el-select>
                     </el-form-item>
-                    <el-form-item prop="HOME_ID">
-                      <el-select v-model.trim="form.HOME_ID"
+                    <el-form-item prop="homeId" :rules="rulesForm.homeId">
+                      <el-select v-model.trim="form.homeId"
                                  placeholder="房号"
                                  size="small"
                                  clearable
@@ -86,7 +85,7 @@
                 
                 </div>
               </el-form-item>
-              <el-form-item v-for="(item,index)  in basicInformation" :label-width="'100px'" :label="item.label" :key="index" :required="item.requiredFlag" :class="item.itemType=='textarea'?'textareaDidth':''" >
+              <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" >
                   <template v-if="item.itemType == 'radio'" >
                       <section class="u-item-width-normal">
                         <el-radio v-for="ns in item.opction"
@@ -99,13 +98,13 @@
                     </el-radio>
                       </section>
                   </template>
-                  <template v-if="item.itemType == 'input'">
+                  <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"
+                              class="u-item-width-normal"  @blur="handleValidBlur(item)"
                            >
                     </el-input>
                   </template>
@@ -139,9 +138,10 @@
                             </el-input>
                   </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  
+                        <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>   
                   </template>
@@ -167,42 +167,39 @@
                                 :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-row v-show="item.groupId=='8'">
-                                        <el-col :span="24">
-                                          <el-button icon="el-icon-plus"
-                                          size="small"
-                                          @click="handleClickAddInputRow"></el-button>
-                                  </el-col>
-                              </el-row>
+                            <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 == 'radio'" >
-                                      <section class="u-item-width-normal">
-                                        <el-radio v-for="ns in itemk.opction"
+                                  <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[item.formName]"
-                                              :label="ns.label"
+                                              v-model.trim="form[itemj.id][itemk.formName]"
+                                              :label="ns.value"
                                           >
                                       {{ ns.label }}
                                     </el-radio>
                                       </section>
                                   </template>
-                                  <template v-else-if="itemk.itemType=='select'" >
+                                  <template v-else-if="itemk.itemType=='select1'" >
                                             <el-select
-                                                  v-model="form[itemk.formName]"
+                                            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=='textarea'" >
+                                  <template v-else-if="itemk.itemType=='textarea1'" >
                                             <el-input
                                             type="textarea"
                                             :placeholder="`请输入${itemk.label}`"
@@ -211,29 +208,32 @@
                                             show-word-limit
                                             resize="none"
                                             rows="3"
-                                            v-model.trim="form[itemk.formName]"
+                                            v-model.trim="form[itemj.id][itemk.formName]"
                                           >
                                          </el-input>
                                   </template>
-                                  <template v-else-if="itemk.itemType=='input'" >
+                                  <template v-else-if="itemk.itemType=='input1'" >
                                             <el-input
                                             :placeholder="`请输入${itemk.label}`"
                                             class="u-item-width-normal"
-                                            v-model.trim="form[itemk.formName]"
+                                            :style="{'margin-right':itemk.label == '备注'?'50px':''}"
+                                            v-model.trim="form[itemj.id][itemk.formName]"
                                             clearable
                                           >
                                          </el-input>
                                   </template>
                                   <template  v-else-if="itemk.itemType=='checkbox'" >
-                                    <el-checkbox v-for="(items,indexs) in itemk.opction" :key="indexs" :style="{'margin-right':items.label != itemk.label? '' :'19px'}" :label="items.label != itemk.label? items.label :''"   
-                                    size="small"
-                                    v-model="form[items.formName]"
+                                  
+                                    <el-checkbox-group 
+                                      size="small"
+                                      v-model="form[itemj.id][itemk.formName]"
                                     >
-                                    </el-checkbox>   
+                                        <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 == 'datepicker'">
+                                  <template v-else-if="itemk.itemType == 'datepicker1'">
                                       <el-date-picker
-                                                    v-model.trim="form[itemk.formName]"
+                                                    v-model.trim="form[itemj.id][itemk.formName]"
                                                     class="u-item-width-normal"
                                                     type="date"
                                                     size="small"
@@ -243,14 +243,18 @@
                                                     value-format="yyyy-MM-dd">
                                     </el-date-picker>
                                 </template>
-                                <template v-else-if="itemk.itemType == 'cascader'">
+                                <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>       
@@ -279,9 +283,10 @@ export default {
     optionsH: [],
     optionsD: [],
     optionsG: [],
-    activeName: 'group0',
-    dictList:[],
-    // 基本信息的input
+    activeName: 'groupeduInfoDto',
+    validateFlag:null,
+    disabilityCategoryCode:[],
+    // 基本信息input
     basicInformation:[{
       label:"本地户籍",
       itemType:"radio",
@@ -295,7 +300,8 @@ export default {
       label:"居民姓名",
       itemType:"input",
       requiredFlag:true,
-      formName:"NAME",
+      formName:"name",
+      rules:[{required:true,message:'居民姓名不能为空',trigger:'blur'}],
       opction:[
         
       ],
@@ -303,7 +309,7 @@ export default {
     {
       label:"联系电话",
       itemType:"input",
-      formName:"tel",
+      formName:"mobile",
       opction:[
         
       ],
@@ -311,441 +317,868 @@ export default {
     {
       label:"证件号",
       itemType:"input",
-      formName:"identityCard",
+      formName:"idNum",
+      rules:[{required:true,message:'证件号不能为空'},
+      { validator: (rule, value, callback) => {
+           if(!/^[1-9]\d{5}(?:18|19|20)\d{2}(?:0[1-9]|10|11|12)(?:0[1-9]|[1-2]\d|30|31)\d{3}[\dXx]$/.test(value)){
+            //  console.log(/^[a-zA-Z]\w{5,17}$/.test(value));
+             return callback(new Error('证件格式不符合'));
+           }
+           callback()
+         },trigger:'change' | blur }
+    ],
       opction:[
         
       ],
     },{
       label:"性别",
       itemType:"radio",
-      formName:"sex",
+      formName:"gender",
       opction:[
         {label:'男',value:'1'},
-        {label:'女',value:'0'}
+        {label:'女',value:'2'}
       ],
     },
     {
       label:"民族",
       itemType:"select",
-      formName:"MZ",
-      opction:[
-        {label:'汉',value:'1'},
-        {label:'回',value:'0'}
-      ],
+      formName:"nation",
+      opction:[],
     },{
       label:'生日',
       itemType:"datepicker",
+      formName:'birthday'
     },{
       label:'备注',
       itemType:"textarea",
+      formName:'remark'
     },{
       label:'居民分类',
       itemType:"checkbox",
-      opction:[{label:'党员',value:'0', formName:"IS_DY",},{label:'低保人员',value:'0', formName:"IS_DB",},{label:'保障房人员',value:'0', formName:"IS_BZ",},{label:'失业人员',value:'0', formName:"IS_SY",},{label:'育龄妇女',value:'0', formName:"IS_YL",},{label:'退役军人',value:'0', formName:"IS_TY",},{label:'统战人员',value:'0', formName:"IS_TZ",},{label:'信访人员',value:'0', formName:"IS_XF",},{label:'志愿者',value:'0', formName:"IS_ZY",},{label:'失独人员',value:'0', formName:"IS_SD",},{label:'租户',value:'0', formName:"IS_ZH",},{label:'流动人口',value:'0', formName:"IS_LD",},{label:'特殊人群',value:'0', formName:"IS_TS",},{label:'老年人',value:'0', formName:"IS_LN",},{label:'空巢老人',value:'0', formName:"IS_KC",},{label:'独居老人',value:'0', formName:"IS_DJ",},{label:'失能老人',value:'0', formName:"IS_SN",},{label:'失智老人',value:'0', formName:"IS_SZ",},{label:'残疾',value:'0', formName:"IS_CJ",},{label:'大病',value:'0', formName:"IS_DBS",},{label:'慢病',value:'0', formName:"IS_MB",}]
+      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:[
-    {id:'0',
+    {id:'eduInfoDto',
     children:[{
       label:"文化程度",
-      itemType:"select",
-      formName:"",
+      itemType:"select1",
+      formName:"cultureLevel",
       opction:[
-        {label:'小学',value:'1'},
-        {label:'初中',value:'0'}
+        
       ]},
       {
        label:"备注",
-      itemType:"textarea",
-      formName:"",
+      itemType:"textarea1",
+      formName:"eduRemark",
       opction:[
       ]}
     ]
     },
     {
-      id:'1',
+      id:'hobbyInfoDto',
       children:[{
         label:"兴趣特长",
         itemType:"checkbox",
-        formName:"",
+        formName:"hobbyCode",
         opction:[
-          {label:'治安巡逻',value:'0',formName:''},
-          {label:'人民调解',value:'0',formName:''},
-          {label:'民情采集',value:'0',formName:''},
-          {label:'问题辅导',value:'0',formName:''},
-          {label:'结对帮扶',value:'0',formName:''},
-          {label:'应急处理',value:'0',formName:''},
-          {label:'义务理发',value:'0',formName:''},
-          {label:'家电维修',value:'0',formName:''},
-          {label:'其他',value:'0',formName:''},
+          {label:'治安巡逻',formName:'hobbyCode1'},
+          {label:'人民调解',formName:'hobbyCode2'},
+          {label:'民情采集',formName:'hobbyCode3'},
+          {label:'问题辅导',formName:'hobbyCode4'},
+          {label:'结对帮扶',formName:'hobbyCode5'},
+          {label:'应急处理',formName:'hobbyCode6'},
+          {label:'义务理发',formName:'hobbyCode7'},
+          {label:'家电维修',formName:'hobbyCode8'},
+          {label:'其他',formName:'9'},
       ]},
       {
         label:'兴趣',
-        itemType:"input",
-        formName:"",
+        itemType:"input1",
+        formName:"interestDesc",
       },
       {
         label:'备注',
-        itemType:"textarea",
-        formName:"",
+        itemType:"textarea1",
+        formName:"hobbyRemark",
       }
     ]
     },
-    {id:'2',
+    {id:'religionDto',
     children:[{
       label:"宗教",
-      itemType:"input",
-      formName:"",
+      itemType:"input1",
+      formName:"religion",
       opction:[
        
       ]},
       {
        label:"备注",
-      itemType:"textarea",
-      formName:"",
+      itemType:"textarea1",
+      formName:"religionRemark",
       opction:[
       ]}
     ]
     },
-    {id:'3',
+    {id:'healthDto',
     children:[{
       label:"残疾类别",
-      itemType:"select",
-      formName:"",
-      opction:[
-       {label:'身体',value:'0'},
-       {label:'灵魂',value:'1'}
-      ]},
+      itemType:"select1",
+      formName:"disabilityCategoryCode",
+      opction:this.disabilityCategoryCode
+    },
       {
        label:"残疾等级",
-      itemType:"select",
-      formName:"",
+      itemType:"select1",
+      formName:"disabilityLevel",
       opction:[
       {label:'一级',value:'0'},
        {label:'二级',value:'1'}
       ]},
       {
        label:"残疾证号",
-      itemType:"input",
-      formName:"",
+      itemType:"input1",
+      formName:"disabilityNum",
       opction:[
       ]},
       {
        label:"残疾说明",
-      itemType:"input",
-      formName:"",
+      itemType:"input1",
+      formName:"disabilityDesc",
       opction:[
       ]},
       {
        label:"监护人",
-      itemType:"radio",
-      formName:"",
+      itemType:"radio1",
+      formName:"guardianFlag",
       opction:[
-        {label:'是',formName:'',value:'1'},
-        {label:'否',formName:'',value:'0'}
+        {label:'有',formName:'',value:1},
+        {label:'无',formName:'',value:0}
       ]},
       {
        label:"技能特长",
-      itemType:"radio",
-      formName:"",
+      itemType:"radio1",
+      formName:"specialSkillFlag",
       opction:[
-        {label:'是',formName:'',value:'1'},
-        {label:'否',formName:'',value:'0'}
+        {label:'有',formName:'',value:1},
+        {label:'无',formName:'',value:0}
       ]},
       {
        label:"劳动能力",
-       itemType:"radio",
-      formName:"",
+       itemType:"radio1",
+      formName:"workCapacityFlag",
       opction:[
-        {label:'是',formName:'',value:'1'},
-        {label:'否',formName:'',value:'0'}
+        {label:'有',formName:'',value:1},
+        {label:'无',formName:'',value:0}
       ]},
       {
        label:"非义务教育阶段助学",
-       itemType:"radio",
-      formName:"",
+       itemType:"radio1",
+      formName:"voluntaryEducationFlag",
       opction:[
-        {label:'是',formName:'',value:'1'},
-        {label:'否',formName:'',value:'0'}
+        {label:'有',formName:'',value:1},
+        {label:'无',formName:'',value:0}
       ]},
       {
        label:"所患大病",
-      itemType:"select",
-      formName:"",
+      itemType:"select1",
+      formName:"illnessCode",
       opction:[
-        {label:'所患大病',value:'',formName:''}
+        
       ]},
       {
        label:"大病患病时间",
-      itemType:"datepicker",
-      formName:"",
+      itemType:"datepicker1",
+      formName:"illnessTime",
       opction:[
         
       ]},
       {
        label:"所患慢性病",
-      itemType:"select",
-      formName:"",
+      itemType:"select1",
+      formName:"chronicDiseaseCode",
       opction:[
-        {label:"选择所患慢性病1",value:"0"},
-        {label:"选择所患慢性病2",value:"1"}
+        
       ]},
       {
        label:"慢病患病时间",
-      itemType:"datepicker",
-      formName:"",
+      itemType:"datepicker1",
+      formName:"chronicDiseaseTime",
       opction:[
         
       ]},
       {
        label:"是否参保",
-       itemType:"radio",
-      formName:"",
+       itemType:"radio1",
+      formName:"insuredFlag",
       opction:[
-        {label:'是',formName:'',value:'1'},
-        {label:'否',formName:'',value:'0'}
+        {label:'是',formName:'',value:1},
+        {label:'否',formName:'',value:0}
       ]},
       {
        label:"自付金额",
-      itemType:"input",
-      formName:"",
+      itemType:"input1",
+      formName:"selfPayAmount",
       opction:[
       ]},
       {
        label:"救助金额",
-      itemType:"input",
-      formName:"",
+      itemType:"input1",
+      formName:"deliveranceAmount",
       opction:[
       ]},
       {
        label:"救助时间",
-      itemType:"datepicker",
-      formName:"",
+      itemType:"datepicker1",
+      formName:"deliveranceTime",
       opction:[
         
       ]},
       {
        label:"享受救助明细序号",
-      itemType:"input",
-      formName:"",
+      itemType:"input1",
+      formName:"deliveranceNum",
       opction:[
       ]},
       {
        label:"备注",
-      itemType:"textarea",
-      formName:"",
+      itemType:"textarea1",
+      formName:"healthRemark",
       opction:[
       ]}
     ]
     },
-    {id:'4',
+    {id:'workInfoDto',
     children:[{
       label:"工作单位",
-      itemType:"input",
-      formName:"",
+      itemType:"input1",
+      formName:"workUnit",
       opction:[
        
       ]},
       {
        label:"职业",
-      itemType:"input",
-      formName:"",
+      itemType:"input1",
+      formName:"occupation",
       opction:[
       ]},
       {
        label:"离退休时间",
-      itemType:"datepicker",
-      formName:"",
+      itemType:"datepicker1",
+      formName:"retireTime",
       opction:[
       ]},
       {
        label:"备注",
-      itemType:"textarea",
-      formName:"",
+      itemType:"textarea1",
+      formName:"workRemark",
       opction:[
       ]}
     ]
     },{
-      id:"5",
+      id:"economyDto",
       children:[
       {
        label:"退休金额",
-      itemType:"input",
-      formName:"",
+      itemType:"input1",
+      formName:"retirementAmount",
       opction:[
       ]}, 
       {
        label:"月收入",
-      itemType:"input",
-      formName:"",
+      itemType:"input1",
+      formName:"monthIncome",
       opction:[
       ]},
       ]
     },{
-      id:"6",
+      id:"resideInfoDto",
       children:[
       {
        label:"籍贯",
-      itemType:"input",
-      formName:"",
+      itemType:"input1",
+      formName:"nativePlace",
       opction:[
       ]}, 
       {
        label:"户籍所在地",
-      itemType:"input",
-      formName:"",
+      itemType:"input1",
+      formName:"placeOfDomicile",
       opction:[
       ]}, 
       {
        label:"现居住地址",
-      itemType:"input",
-      formName:"",
+      itemType:"input1",
+      formName:"currentResidence",
       opction:[
       ]}, 
       {
        label:"人户状况",
-      itemType:"select",
-      formName:"",
+      itemType:"select1",
+      formName:"householdSituation",
       opction:[
       ]},
       {
        label:"备注",
-      itemType:"textarea",
-      formName:"",
+      itemType:"textarea1",
+      formName:"resiRemark",
       opction:[
       ]}
       ]
     },{
-      id:"7",
+      id:"familyInfoDto",
       children:[
       {
        label:"与户主关系",
-      itemType:"select",
-      formName:"",
+      itemType:"select1",
+      formName:"houseHolderRel",
       opction:[
       ]},
       {
        label:"居住情况",
-      itemType:"select",
-      formName:"",
+      itemType:"select1",
+      formName:"resideSituation",
       opction:[
       ]}, 
       {
-       label:"婚姻情况",
-      itemType:"select",
-      formName:"",
+       label:"婚姻状况",
+      itemType:"select1",
+      formName:"marriage",
       opction:[
       ]}, 
       {
        label:"配偶情况",
-      itemType:"select",
-      formName:"",
+      itemType:"select1",
+      formName:"spouseSituation",
       opction:[
       ]},
       {
        label:"该居民有无赡养人",
-      itemType:"radio",
-      formName:"",
+      itemType:"radio1",
+      formName:"elderlyFlag",
       opction:[
-        {label:'是',value:"1"},
-        {label:'否',value:"0"}
+        {label:'是',value:1},
+        {label:'否',value:0}
       ]},
        {
        label:"该居民与赡养人关系",
-      itemType:"select",
-      formName:"relationship",
+      itemType:"select1",
+      formName:"elderlyRelation",
+      opction:[
+      ]},
+      {
+       label:"赡养人联系电话",
+      itemType:"input1",
+      formName:"dependantMobile",
+      opction:[
+      ]}, {
+       label:"备注",
+      itemType:"textarea1",
+      formName:"familyInfoRemark",
+      opction:[
+      ]}
+      ]
+    },{
+      id:"parymemberInfoDto",
+      children:[
+      {
+       label:"入党时间",
+      itemType:"datepicker1",
+      formName:"joinTime",
+      opction:[
+      ]},
+      {
+       label:"转正时间",
+      itemType:"datepicker1",
+      formName:"positiveTime",
+      opction:[
+      ]}, 
+      {
+       label:"所属支部",
+      itemType:"cascader1",
+      formName:"branchId",
+      opction:[
+      ]}, 
+      {
+       label:"流动党员",
+      itemType:"radio1",
+      formName:"flowFlag",
+      opction:[
+        {label:'是',value:1},
+        {label:'否',value:0},
+      ]},
+      {
+       label:"流动党员活动证号",
+      itemType:"input1",
+      formName:"flowActNum",
+      opction:[
+        
+      ]},
+       {
+       label:"职务",
+      itemType:"select1",
+      formName:"partyJob",
+      opction:[
+      ]},
+      {
+       label:"是否退休",
+      itemType:"radio1",
+      formName:"retiredFlag",
+      opction:[
+        {label:'是',value:1},
+        {label:'否',value:0},
+      ]}, {
+       label:"党员中心户",
+      itemType:"radio1",
+      formName:"centerFlag",
+      opction:[
+        {label:'是',value:1},
+        {label:'否',value:0},
+      ]},{
+       label:"入党时所在党支部	",
+      itemType:"input1",
+      formName:"joinBranchName",
+      opction:[
+        
+      ]},{
+       label:"组织关系转入社区时间",
+      itemType:"datepicker1",
+      formName:"joinCommunityTime",
+      opction:[
+      ]},{
+       label:"是否请长假",
+      itemType:"radio1",
+      formName:"longHolidayFlag",
+      opction:[
+        {label:'是',value:1},
+        {label:'否',value:0},
+      ]}
+      ]
+    },{
+      id:'ensureHouseDto',
+      children:[
+      
+      {
+       label:"住房性质",
+      itemType:"select1",
+      formName:"housingNature",
+      opction:[
+      ]}, 
+      {
+       label:"保障类型",
+      itemType:"input1",
+      formName:"securityType",
+      opction:[
+      ]},{
+       label:"发证日期",
+      itemType:"datepicker1",
+      formName:"certificateDate",
+      opction:[
+      ]}, 
+      {
+       label:"补贴编号",
+      itemType:"input1",
+      formName:"subsidyNum",
+      opction:[
+        
+      ]},
+       {
+       label:"补贴金额	",
+      itemType:"input1",
+      formName:"subsidyAmount",
+      opction:[
+      ]}
+      ]
+    },{
+      id:'unemployedDto',
+      children:[
+      {
+       label:"原工作单位",
+      itemType:"input1",
+      formName:"originWorkUnit",
+      }, 
+      {
+       label:"失业时间",
+      itemType:"datepicker1",
+      formName:"unemploymentTime",
+      opction:[
+        {label:'是',value:1},
+        {label:'否',value:0},
+      ]},{
+       label:"失业证号",
+      itemType:"input1",
+      formName:"unemploymentNum",
+      opction:[
+      ]}, 
+      {
+       label:"再就业优惠证号",
+      itemType:"input1",
+      formName:"employmentNum",
+      opction:[
+        
+      ]},
+       {
+       label:"技术特长",
+      itemType:"input1",
+      formName:"specialSkill",
+      opction:[
+      ]},{
+       label:"失业原因",
+      itemType:"input1",
+      formName:"unemploymentReason",
+      opction:[
+      ]} ,{
+       label:"是否就业困难对象",
+      itemType:"radio1",
+      formName:"employmentHardFlag",
+      opction:[
+        {label:'是',value:1},
+        {label:'否',value:0}
+      ]}, {
+       label:"劳动能力就业愿望",
+      itemType:"input1",
+      formName:"employmentWish",
+      opction:[
+      ]}
+      ]
+    },{
+      id:'veteranDto',
+      children:[
+      {
+       label:"入伍时间",
+      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:"培训状况",
+      itemType:"input1",
+      formName:"trainDesc",
+      opction:[
+      ]},
+      {
+       label:"参战时间开始日期",
+      itemType:"datepicker1",
+      formName:"joinWarStartTime",
+      opction:[
+      ]},
+      {
+       label:"参战时间截止日期",
+      itemType:"datepicker1",
+      formName:"joinWarEndTime",
+      opction:[
+      ]} ,
+       {
+       label:"现就业情况",
+      itemType:"input1",
+      formName:"employmentSituation",
       opction:[
       ]},
+       {
+       label:"是否办理公益性岗位",
+      itemType:"radio1",
+      formName:"pubWelfareJobFlag",
+      opction:[
+        {label:'是',value:1},
+        {label:'否',value:0},
+      ]}
       ]
     },
     {
-      id:'8',
-      children:[
-        {
-        label:"需求类别",
-        itemType:"cascader",
-        formName:"demandoption",
+      id:'unitedFrontDto',
+      children:[{
+        label:"职务",
+        itemType:"input1",
+        formName:"duty",
+      },
+      {
+        label:"探亲情况	",
+        itemType:"input1",
+        formName:"visitation",
+      }]
+    },{
+      id:'volunteerDto',
+      children:[{
+        label:"志愿者类别",
+        itemType:"checkbox",
+        formName:"volunteerCategory",
         opction:[
-       
-         ]
-        },
-        {
-           label:"备注",
-          itemType:"input",
-          formName:"",
-        } 
-      ]
+          {label:'文化队伍',formName:'hobbyCode1'},
+          {label:'楼委会',formName:'hobbyCode2'},
+          {label:'能人达人',formName:'hobbyCode3'},
+          {label:'老友俱乐部',formName:'hobbyCode4'},
+          {label:'代办员',formName:'hobbyCode5'},
+          {label:'调解员',formName:'hobbyCode6'},
+          {label:'采集员',formName:'hobbyCode7'},
+          {label:'治安巡逻员',formName:'9'},
+      ]},
+      {
+        label:'备注',
+        itemType:"textarea1",
+        formName:"volunteerRemark",
+      }
+    ]
+    },{
+      id:'oldPeopleDto',
+      children:[ {
+        label:'高龄补助',
+        itemType:"input1",
+        formName:"oldSubsidy",
+      },]
+    },{
+      id:'specialDto',
+      children:[ {
+        label:'人群类别',
+        itemType:"select1",
+        formName:"specialCategoryCode",
+        opction:[]
+      },]
     }
+    
     ],
+
     form:{
-          GRID_ID: '',
-          VILLAGE_ID: '',
-          BUILD_ID: '',
-          UNIT_ID: '',
-          HOME_ID: '',
-          NAME:'',
-          MZ:'',
-          localResidenceFlag:'',
-          birthday:'',
-          identityCard:'',
-          sex:'',
-          IS_DY:false,
-          IS_DB:false,
-          IS_BZ:false,
-          IS_SY:false,
-          IS_YL:false,
-          IS_TY:false,
-          IS_TZ:false,
-          IS_XF:false,
-          IS_ZY:false,
-          IS_SD:false,
-          IS_ZH:false,
-          IS_LD:false,
-          IS_TS:false,
-          IS_LN:false,
-          IS_KC:false,
-          IS_DJ:false,
-          IS_SN:false,
-          IS_SZ:false,
-          IS_CJ:false,
-          IS_DBS:false,
-          IS_MB:false,
-          eduInfoDto:{},
-          relationship:[]
+          agencyName:this.$store.state.user.agencyName,
+          agencyId:this.$store.state.user.agencyId,
+          gridName:'',
+          gridId:'', //所属网格id
+          villageId: '', //小区id
+          buildId: '', //楼栋id
+          unitId: '', //单元id
+          homeId: '', //房屋id
+          name:'', //姓名
+          nation:'', //民族
+          localResidenceFlag:'', //本地户籍
+          birthday:'', //生日
+          idNum:'', //证件号
+          gender:'', // 性别
+          mobile:'', //手机
+          partyFlag:'0',//党员
+          subsistenceAllowanceFlag:'0', //低保
+          ensureHouseFlag:'0', //保障房
+          unemployedFlag:'0',//失业
+          fertileWomanFlag:'0', //育龄妇女
+          veteranFlag:'0', //退役军人
+          unitedFrontFlag:'0',//统战人员
+          petitionOfficerFlag:'0',//信访人员
+          volunteerFlag:'0', //志愿者
+          bereavedPersonFlag:'0', //失独
+          tenantFlag:'0', //租户
+          floatingFlag:'0',//流动人口
+          specialCrowdFlag:'0',//特殊人群
+          oldPeopleFlag:'0', //老年人
+          emptyNesterFlag:'0', //空巢
+          liveAloneFlag:'0', //独居老人
+          disabledFlag:'0', //失能老人
+          dementedFlag:'0', //失智老人
+          disabilityFlag:'0',//是否残疾
+          seriousIllnessFlag:'0', //大病
+          chronicDiseaseFlag:'0', //慢病
+          eduInfoDto:{ // 教育信息
+            cultureLevel:'',
+            eduRemark:''
+          },
+          hobbyInfoDto:{ //兴趣爱好
+            hobbyCode:[],//兴趣特长
+            interestDesc:'',//兴趣
+            hobbyRemark:''//备注
+          },
+          religionDto:{
+            religion:'',
+            religionRemark:''
+          },
+          healthDto:{ // 健康
+            disabilityCategoryCode:'',//残疾类别
+            disabilityLevel:'',//残疾等级
+            disabilityNum:'',//残疾证号
+            disabilityDesc:'',//残疾说明
+            guardianFlag:null,//有无监护人
+            specialSkillFlag:null,//有无技能特长【有:1 无:0】
+            workCapacityFlag:null,//有无劳动能力【有:1 无:0】
+            voluntaryEducationFlag:null,//有无非义务教育阶段助学【有:1 无:0】
+            illnessCode:'',//所患大病字典code
+            illnessTime:'',//大病患病时间yyyy-MM-dd
+            chronicDiseaseCode:'',//所患慢性病code
+            chronicDiseaseTime:'',//慢病患病时间
+            insuredFlag:'',//是否参保【是:1 否:0】
+            selfPayAmount:'',//自付金额
+            deliveranceAmount:'',//救助金额
+            deliveranceTime:'',//救助时间
+            deliveranceNum:'',//享受救助明细序号
+            healthRemark:''//备注
+          },
+          workInfoDto:{ //工作
+            workUnit:'',//工作单位
+            occupation:'',//职业	
+            retireTime:'',//离退休时间		
+            workRemark:'',//备注		
+          },
+          economyDto:{//经济
+            retirementAmount:'',//退休金额	
+            monthIncome:'',//月收入
+          },
+          resideInfoDto:{//居住信息
+            nativePlace:'',//籍贯
+            placeOfDomicile:'',//户籍所在地	
+            currentResidence:'',//现居住地	
+            householdSituation:'',//人户情况，字典code
+            resiRemark:'',//备注
+          },
+          familyInfoDto:{//家庭
+            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:'',//流动党员活动证号	
+            partyJob:'',//职务，字典code
+            retiredFlag:null,//是否退休：1是，0否
+            centerFlag:null,//是否党员中心户：1是，0否
+            joinBranchName:'',//入党时所在党支部
+            joinCommunityTime:'',//组织关系转入社区时间yyyy-MM-dd
+            longHolidayFlag:null,//是否请长假：1是，0否
+          },
+          ensureHouseDto:{//保障房信息
+            housingNature:'',//住房性质，字典code
+            securityType:'',//保障类型	
+            certificateDate:'',//发证日期yyyy-MM-dd
+            subsidyNum:'',//补贴编号	
+            subsidyAmount:'',//补贴金额	
+          },
+          unemployedDto:{//失业信息
+            originWorkUnit:'',//原工作单位
+            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	
+            pubWelfareJobFlag:null,//是否办理公益性岗位;1是0否
+          },
+          unitedFrontDto:{//统战人员
+            duty:'',//职务
+            visitation:'',//探亲情况	
+          },
+          volunteerDto:{//志愿者信息	
+            volunteerCategory:[],//志愿者类别
+            volunteerRemark:''//备注
+
+          },
+          oldPeopleDto:{
+            oldSubsidy:''//高龄补助	
+          },
+          specialDto:{//特殊人群
+            specialCategoryCode:[]//人群类别【字典表】,可多选，以英文逗号隔开；	
+          }
     },
     rulesForm: {
-          VILLAGE_ID: [{ required: true, message: `请选择小区`, trigger: 'blur' }],
-          GRID_ID: [{ required: true, message: `请选择网格`, trigger: 'blur' }],
-          BUILD_ID: [{ required: true, message: `请选择楼号`, trigger: 'blur' }],
-          UNIT_ID: [{ required: true, message: `请选择单元`, trigger: 'blur' }],
-          HOME_ID: [{ required: true, message: `请选择房号`, trigger: 'blur' }],
+          villageId: [{ required: true, message: `请选择小区`, trigger: 'blur' }],
+          gridId: [{ required: true, message: `请选择网格`, trigger: 'blur' }],
+          buildId: [{ required: true, message: `请选择楼号`, trigger: 'blur' }],
+          unitId: [{ required: true, message: `请选择单元`, trigger: 'blur' }],
+          homeId: [{ required: true, message: `请选择房号`, trigger: 'blur' }],
           NAME:[{ required: true, message: `请选择房号`, trigger: 'blur' }]
     },
     // 底部tabs选项
     tabsList:[
-      {groupId:'0',label:'教育'},{groupId:'1',label:'兴趣爱好'},{groupId:'2',label:'宗教信仰'},{groupId:'3',label:'健康'},{groupId:'4',label:'工作'},{groupId:'5',label:'经济情况'},{groupId:'6',label:'居住'},{groupId:'7',label:'家庭'},{groupId:'8',label:'居民需求'},{groupId:'9',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:'家庭'},
     ]
    }
   },
   computed: {
-   
   },
   watch: {
+    form:{
+    handler (val, val2) {
+      
+    },
+      deep:true,
+      immediate:true
+    },
   },
   created () {
     this.getGridList()
-    // 民族字典
+ 
+    this.getAllNation()
+  },
+  methods: {
+
+    submit_from(){
+      this.$refs.formId.validate(v=>{
+        this.validateFlag = v
+      })
+    },
+
+    getAllNation(){
+         // 民族字典
     this.getDictList()
     // 关系字典
     this.getRelationship()
-    // 需求信息
-    this.getDemandoption()
-  },
-  methods: {
+    // 学历信息
+    this.getEducation()
+    //残疾类别
+    this.getdisabilityNation()
+    this.getdisabilityNationClass()
+    this.getillnessNation()
+    this.getchronicNation()
+    this.getHouseholdNation()
+    this.getMarriageNation()
+    this.getResideNation()
+    this.getSpouseNation()
+    this.getBranchlist()
+    this.getPartyNation()
+    this.getResidentNation()
+    this.getHousing()
+    },
       getGridList () {
         const { user } = this.$store.state
-        console.log('agencyId', user)
         this.$http
           .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'addorupdate' })
           .then(({ data: res }) => {
@@ -763,7 +1196,7 @@ export default {
       getValiheList () {
         const { user } = this.$store.state
         this.$http
-          .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.form.GRID_ID, agencyId: user.agencyId })
+          .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.form.gridId, agencyId: user.agencyId })
           .then(({ data: res }) => {
             if (res.code !== 0) {
               return this.$message.error(res.msg)
@@ -776,9 +1209,163 @@ export default {
             return this.$message.error('网络错误')
           })
       },
+      async  getdisabilityNation(){
+      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
+              }
+          }
+        })
+
+      } 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
+              }
+          }
+        })
+
+      } catch (error) {
+        console.log(error,'获取残疾等级字典');
+      }
+
+      },
+      async  getillnessNation(){
+      try {
+        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'illness_code'})
+        this.footerInputList.forEach(c => {
+          for(let i of c.children){
+              if(i.formName == 'illnessCode'){
+                  i.opction = data.data
+              }
+          }
+        })
+
+      } catch (error) {
+        console.log(error,'获取所患大病字典');
+      }
+      }, 
+       async  getchronicNation(){
+        try {
+          const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'chronic_disease_code'})
+          this.footerInputList.forEach(c => {
+            for(let i of c.children){
+                if(i.formName == 'chronicDiseaseCode'){
+                    i.opction = data.data
+                }
+            }
+          })
+
+        } catch (error) {
+          console.log(error,'获取所患慢病字典');
+        }
+      },
+      async  getHouseholdNation(){
+        try {
+          const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'household_situation'})
+          this.footerInputList.forEach(c => {
+            for(let i of c.children){
+                if(i.formName == 'householdSituation'){
+                    i.opction = data.data
+                }
+            }
+          })
+
+        } catch (error) {
+          console.log(error,'获取人户状况字典');
+        }
+      },
+      async  getMarriageNation(){
+        try {
+          const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'marriage'})
+          this.footerInputList.forEach(c => {
+            for(let i of c.children){
+                if(i.formName == 'marriage'){
+                    i.opction = data.data
+                }
+            }
+          })
+
+        } catch (error) {
+          console.log(error,'获取婚姻状况字典');
+        }
+      },
+      async  getResideNation(){
+        try {
+          const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'reside_situation'})
+          this.footerInputList.forEach(c => {
+            for(let i of c.children){
+                if(i.formName == 'resideSituation'){
+                    i.opction = data.data
+                }
+            }
+          })
+
+        } catch (error) {
+          console.log(error,'获取居住情况字典');
+        }
+      },
+      async  getSpouseNation(){
+        try {
+          const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'spouse_situation'})
+          this.footerInputList.forEach(c => {
+            for(let i of c.children){
+                if(i.formName == 'spouseSituation'){
+                    i.opction = data.data
+                }
+            }
+          })
+
+        } catch (error) {
+          console.log(error,'获取配偶情况字典');
+        }
+      },
+      async  getResidentNation(){
+        try {
+          const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'resident_category'})
+          this.footerInputList.forEach(c => {
+            for(let i of c.children){
+                if(i.formName == 'specialCategoryCode'){
+                    i.opction = data.data
+                }
+            }
+          })
+
+        } catch (error) {
+          console.log(error,'获取配偶情况字典');
+        }
+      },
+      async  getPartyNation(){
+        try {
+          const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'party_job'})
+          this.footerInputList.forEach(c => {
+            for(let i of c.children){
+                if(i.formName == 'partyJob'){
+                    i.opction = data.data
+                }
+            }
+          })
+
+        } catch (error) {
+          console.log(error,'获取职务字典');
+        }
+      },
       getBuildList () {
         this.$http
-          .post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.form.VILLAGE_ID })
+          .post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.form.villageId })
           .then(({ data: res }) => {
             if (res.code !== 0) {
               return this.$message.error(res.msg)
@@ -793,7 +1380,7 @@ export default {
       },
       getUniList () {
         this.$http
-          .post('/gov/org/icbuildingunit/unitoption', { buildingId: this.form.BUILD_ID })
+          .post('/gov/org/icbuildingunit/unitoption', { buildingId: this.form.buildId })
           .then(({ data: res }) => {
             if (res.code !== 0) {
               return this.$message.error(res.msg)
@@ -808,7 +1395,7 @@ export default {
       },
       getHouseList () {
         this.$http
-          .post('/gov/org/ichouse/houseoption', { unitId: this.form.UNIT_ID })
+          .post('/gov/org/ichouse/houseoption', { unitId: this.form.unitId })
           .then(({ data: res }) => {
             if (res.code !== 0) {
               return this.$message.error(res.msg)
@@ -821,13 +1408,52 @@ export default {
             return this.$message.error('网络错误')
           })
       },
+      handleChangeCheckbox(e,val){
+          this.handleTabShow(val,e)
+      },
+      handleTabShow(val,e){
+       if(e == 1){
+              if(val.formName == 'partyFlag'){
+                this.tabsList.push({label:'党员信息',id:'0',groupId:'parymemberInfoDto'})
+              }else if(val.formName == 'ensureHouseFlag'){
+                this.tabsList.push({label:'保障房信息',id:'1',groupId:'ensureHouseDto'})
+              }else if(val.formName == 'unemployedFlag'){
+                this.tabsList.push({label:'失业',id:'2',groupId:'unemployedDto'})
+              }else if(val.formName == 'veteranFlag'){
+                this.tabsList.push({label:'退役军人',id:'3',groupId:'veteranDto'})
+              }else if(val.formName == 'unitedFrontFlag'){
+                this.tabsList.push({label:'统战',id:'4',groupId:'unitedFrontDto'})
+              }else if(val.formName == 'volunteerFlag'){
+                this.tabsList.push({label:'志愿者信息',id:'5',groupId:'volunteerDto'})
+              }else if(val.formName == 'oldPeopleFlag'){
+                this.tabsList.push({label:'老年人',id:'6',groupId:'oldPeopleDto'})
+              }else if(val.formName == 'specialCrowdFlag') {
+                this.tabsList.push({label:'特殊人群',id:'7',groupId:'specialDto'})
+              }
+       }else {
+           let i = val.formName == 'partyFlag'?'0': val.formName == 'ensureHouseFlag'?'1':val.formName == 'unemployedFlag'?'2':val.formName == 'veteranFlag'?'3':val.formName == 'unitedFrontFlag'?'4':val.formName == 'volunteerFlag'?'5':val.formName == 'oldPeopleFlag'?'6':val.formName == 'specialCrowdFlag'?'7':''
+
+           if(i != ''){
+              this.tabsList.forEach(item =>{
+                if(i != item.id){
+                  this.tabsList = this.tabsList.filter(items=>items.id!=i)
+                }
+            }) 
+            }
+       }
+       
+      },
       handleChangeGrid (val) {
-        console.log(this.form);
         console.log('val', val)
-        this.form.VILLAGE_ID = ''
-        this.form.BUILD_ID = ''
-        this.form.UNIT_ID = ''
-        this.form.HOME_ID = ''
+        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()
@@ -835,57 +1461,74 @@ export default {
           this.getHouseList()
         }
       },
-      // 点击下方加号按钮
-      handleClickAddInputRow(){
-        this.footerInputList.forEach(c =>{
-          if(c.id == 8){
-            let num =  0 
-            c.children.push(
-              {
-                label:"需求类别",
-                formName:'',
-                itemType:"cascader",
-                // formName:'a' + num,
-                opction:[
-
-                ]
-              },
-              {
-                label:"备注",
-                itemType:"input",
-                formName:'',
-                formName:"",
-              } 
-            )
-            num++
-            console.log(num,'asdsadsa');
+      validateIdcard (idCard, type) {
+        this.$http
+          .post('/epmetuser/icresiuser/getUserRoleByIdCard', { idCard })
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              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
+                this.partyInfo = res.data.detail.ic_party_member
+              } else this.form.partyFlag = false
+            }
+          })
+          .catch(() => {
+            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' : '0'
+              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.BUILD_ID = ''
-        this.form.UNIT_ID = ''
-        this.form.HOME_ID = ''
+        this.form.buildId = ''
+        this.form.unitId = ''
+        this.form.homeId = ''
         this.getBuildList()
         this.getUniList()
         this.getHouseList()
       },
       handleChangeB (val) {
         console.log('val', val)
-        this.form.UNIT_ID = ''
-        this.form.HOME_ID = ''
+        this.form.unitId = ''
+        this.form.homeId = ''
         this.getUniList()
         this.getHouseList()
       },
       handleChangeD () {
-        this.form.HOME_ID = ''
+        this.form.homeId = ''
         this.getHouseList()
       },
       handleClick (tab, event) {
-   
       },
       handleForm () {
         let newForm = []
@@ -943,7 +1586,7 @@ export default {
         const { data } = await this.$http.post('sys/dict/data/nation',{formCode: "resi_base_info"})
         this.dictList = data
         this.basicInformation.forEach(c => {
-          if(c.formName == 'MZ'){
+          if(c.formName == 'nation'){
             c.opction = data.data
             console.log(c.opction);
           }
@@ -960,9 +1603,8 @@ 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 == 'relationship'){
+              if(i.formName == 'houseHolderRel' ||i.formName == 'elderlyRelation' ){ 
                   i.opction = data.data
-                  console.log( i.opction );
               }
           }
         })
@@ -972,38 +1614,71 @@ export default {
         }
 
       },
-      getTreeData(data) {
-			for (var i = 0; i < data.length; i++) {
-				if (data[i].children.length < 1) {
-					// children若为空数组，则将children设为undefined
-					data[i].children = undefined;
-				} else {
-					// children若不为空数组，则继续 递归调用 本方法
-					this.getTreeData(data[i].children);
-				}
-			}
-			return data;
-		},
+      async  getBranchlist(){
+      try {
+        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' ){ 
+                  i.opction = data.data
+              }
+          }
+        })
 
-      // 获取需求类别字典
-      async  getDemandoption(){
+        } catch (error) {
+          console.log(error,'获取支部字典');
+        }
+      },
+      getTreeData (data) {
+      if (!Array.isArray(data)) return [];
+      let arr = data.map((item) => {
+        let _item = {};
+        if (item.children) {
+          if (item.children.length === 0)
+            _item = { ...item, children: undefined };
+          else _item = { ...item, children: this.getTreeData(item.children) };
+        } else {
+          _item = { ...item };
+        }
+        return _item;
+      });
+      return arr;
+    },
+   
+      async  getEducation(){
       try {
-        const { data } = await this.$http.post('heart/icresidemanddict/demandoption',{formCode: "resi_base_info"})
-        this.getTreeData(data)
+        let { data } = await this.$http.post('sys/dict/data/education',{formCode: "resi_base_info"})
+        data.data = this.getTreeData(data.data)
         this.footerInputList.forEach(c => {
           for(let i of c.children){
-              if(i.formName == 'demandoption'){
+              if(i.formName == 'cultureLevel'){
                   i.opction = data.data
                   console.log( i.opction );
               }
           }
         })
-
         } catch (error) {
           console.log(error,'获取民族字典');
         }
 
       },
+      async  getHousing(){
+      try {
+        let { data } = await this.$http.post('sys/dict/data/house',{formCode: "resi_base_info"})
+        data.data = this.getTreeData(data.data)
+        this.footerInputList.forEach(c => {
+          for(let i of c.children){
+              if(i.formName == 'housingNature'){
+                  i.opction = data.data
+              }
+          }
+        })
+
+        } catch (error) {
+          console.log(error,'获取住房性质字典');
+        }
+
+      },
   }
 }
 </script>
diff --git a/src/views/dataBoard/renfang/cpts/fwgl.vue b/src/views/dataBoard/renfang/cpts/fwgl.vue
new file mode 100644
index 000000000..edaf98176
--- /dev/null
+++ b/src/views/dataBoard/renfang/cpts/fwgl.vue
@@ -0,0 +1,21 @@
+<template>
+  <div>房屋概览</div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+
+export default {
+  props: {
+    orgId: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {},
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/dataBoard/renfang/cpts/jmgl.vue b/src/views/dataBoard/renfang/cpts/jmgl.vue
new file mode 100644
index 000000000..edaf98176
--- /dev/null
+++ b/src/views/dataBoard/renfang/cpts/jmgl.vue
@@ -0,0 +1,21 @@
+<template>
+  <div>房屋概览</div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+
+export default {
+  props: {
+    orgId: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {},
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/dataBoard/renfang/cpts/rkfx.vue b/src/views/dataBoard/renfang/cpts/rkfx.vue
new file mode 100644
index 000000000..edaf98176
--- /dev/null
+++ b/src/views/dataBoard/renfang/cpts/rkfx.vue
@@ -0,0 +1,21 @@
+<template>
+  <div>房屋概览</div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+
+export default {
+  props: {
+    orgId: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {},
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/dataBoard/renfang/cpts/rkyj.vue b/src/views/dataBoard/renfang/cpts/rkyj.vue
new file mode 100644
index 000000000..edaf98176
--- /dev/null
+++ b/src/views/dataBoard/renfang/cpts/rkyj.vue
@@ -0,0 +1,21 @@
+<template>
+  <div>房屋概览</div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+
+export default {
+  props: {
+    orgId: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {},
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue
index 93224e2ef..8fcdab663 100644
--- a/src/views/dataBoard/renfang/index.vue
+++ b/src/views/dataBoard/renfang/index.vue
@@ -10,7 +10,9 @@
           <div class="box-title-txt">房屋概览</div>
         </div>
 
-        <div class="m-subbox"></div>
+        <div class="m-subbox">
+          <fwgl :orgId="orgData.id"></fwgl>
+        </div>
       </div>
 
       <div class="m-box">
@@ -22,7 +24,9 @@
           <div class="box-title-txt">居民概览</div>
         </div>
 
-        <div class="m-subbox"></div>
+        <div class="m-subbox">
+          <jmgl :orgId="orgData.id"></jmgl>
+        </div>
       </div>
     </div>
 
@@ -156,7 +160,9 @@
           <div class="box-title-txt">人口分析</div>
         </div>
 
-        <div class="m-subbox"></div>
+        <div class="m-subbox">
+          <rkfx :orgId="orgData.id"></rkfx>
+        </div>
       </div>
 
       <div class="m-box">
@@ -168,7 +174,9 @@
           <div class="box-title-txt">人口预警</div>
         </div>
 
-        <div class="m-subbox"></div>
+        <div class="m-subbox">
+          <rkyj :orgId="orgData.id"></rkyj>
+        </div>
       </div>
     </div>
   </div>
@@ -176,11 +184,15 @@
 
 <script>
 import gridMap from "@/views/dataBoard/cpts/map/index";
+import fwgl from "@/views/dataBoard/renfang/cpts/fwgl";
+import jmgl from "@/views/dataBoard/renfang/cpts/jmgl";
+import rkfx from "@/views/dataBoard/renfang/cpts/rkfx";
+import rkyj from "@/views/dataBoard/renfang/cpts/rkyj";
 import { requestPost } from "@/js/dai/request";
 import getQueryPara from "dai-js/modules/getQueryPara";
 
 export default {
-  components: { gridMap },
+  components: { gridMap, fwgl, jmgl, rkfx, rkyj },
 
   data() {
     return {
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 361b9b87a..ecdd71d17 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -17,13 +17,7 @@
         </el-collapse-item>
       </el-collapse> -->
       <!-- <template v-else> -->
-      <resi-search v-if="searchList.length > 0"
-                   ref="resiSearch"
-                   :form-list="searchList[0].queryItemList"
-                   :column-name="defaultCategotyKey"
-                   :show-grid="true"
-                   :is-arrow="true"
-                   @search="handleSearch" />
+     
       <!-- </template> -->
       <!-- <el-row v-if="openSearch"
               class="resi-search">
@@ -127,19 +121,31 @@
                          :prop="item.columnName"
                          :label="item.label"
                          align="left"
-                         :fixed="item.columnName == 'NAME' ? 'left' : false"
                          :show-overflow-tooltip="true"
                          :width="item.width || computedWidth(item.label, item.itemType)">
           <!-- :width="item.itemType === 'radio' ? computedWidth(item.label) : 180" -->
           <template slot-scope="scope">
-        
+            
             <a v-if="item.columnName == 'NAME' && btnAuths.ic_resi_view"
                class="name-a"
-               @click="handleLook(scope.row)">
+               >
               {{ handleFilterSpan(scope.row, item) }}
             </a>
+            <div v-else-if="item.columnName == 'gender'">
+              {{scope.row.gender == 1 ? '男' : '女' }}
+            </div>
+            <div  v-else-if="item.columnName == 'birthday'">
+              {{scope.row.birthday.substr(0,10) }}
+            </div>
+            <div  v-else-if="item.columnName == 'idNum'">
+              {{`${scope.row.idNum.substr(0,11)}`+'******'+`${scope.row.idNum.substr(16,2)}` }}
+            </div>
+            <div  v-else-if="item.columnName == 'mobile'">
+              {{`${scope.row.mobile.substr(0,3)}`+'******'+`${scope.row.mobile.substr(7,4)}` }}
+            </div>
             <span v-else>{{ handleFilterSpan(scope.row, item) }}</span>
           </template>
+      
         </el-table-column>
         <el-table-column fixed="right"
                          label="操作"
@@ -166,21 +172,26 @@
               <el-popconfirm v-if="btnAuths.ic_resi_del"
                              title="删除之后无法回复，确认删除？"
                              @onConfirm="handleDel(scope.row)">
-                <!-- <el-button slot="reference"
-                           type="text"
-                           size="small"
-                           class="btn-color-del">删除</el-button> -->
               </el-popconfirm>
             </template>
 
-            <el-button @click="handleChangeTransfer(scope.row)"
+            <el-button 
                        type="text"
                        class="div-table-button--blue"
-                       size="small">迁出登记</el-button>
-            <el-button @click="handleDeath(scope.row)"
-                       class="div-table-button--blue"
+                       size="small"  @click="handleLook(scope.row)">查看</el-button>
+            <el-button 
                        type="text"
-                       size="small">死亡登记</el-button>
+                       class="div-table-button--blue f-right10"
+                       size="small">编辑</el-button>           
+            <el-dropdown trigger="click" @command="handelRegister">
+                        <span class=" div-table-button--blue">
+                          登记<i class="el-icon-arrow-down el-icon--right"></i>
+                        </span>
+                          <el-dropdown-menu slot="dropdown" >
+                           <el-dropdown-item >死亡登记</el-dropdown-item>
+                           <el-dropdown-item >迁出登记</el-dropdown-item>
+                            </el-dropdown-menu>
+                          </el-dropdown>           
           </template>
         </el-table-column>
       </el-table>
@@ -450,7 +461,9 @@ export default {
       editTableName: {},
       formName: "",
       formList: [],
-      tableHeader: [],
+      tableHeader: [
+      {columnName:'name',label:'姓名'}, {columnName:'birthday',label:'生日'},{columnName:'gender',label:'性别'},{columnName:'gridName',label:'所属网格'},{columnName:'homeName',label:'所属房屋'},{columnName:'idNum',label:'证件号'},{columnName:'mobile',label:'联系电话'}
+      ],
       tabsList: [],
       selection: [],
 
@@ -489,8 +502,6 @@ export default {
       let query = this.$route.query;
       this.defaultCategotyKey = query.columnName;
       console.log("defaultCategotyKey----", this.defaultCategotyKey);
-      await this.getSearchList();
-      this.$refs.resiSearch.handleSearch();
     }
   },
   computed: {
@@ -509,20 +520,14 @@ export default {
       this.defaultCategotyKey = query.columnName;
     }
 
-    await this.getSearchList();
 
 
     // await this.getFormList()
-    await this.getTableHeader();
-    // console.log('this.$refs.resiSearch', this)
-    this.$refs.resiSearch.handleSearch();
 
-    // this.handleSearch()
-    // this.getTableData()
+    // console.log('this.$refs.resiSearch', this)
+    this.getTableData()
     this.pageLoading = true;
-    this.searchH = this.$refs.resiSearch.$el.offsetHeight;
     console.log("storeoooo----0000", this.$store);
-    console.log("resiSearch", this.$refs.resiSearch.$el.offsetHeight);
   },
   async mounted () {
     // this.$nextTick(() => {
@@ -549,6 +554,9 @@ export default {
         });
       }
     },
+    handelRegister(row){
+     console.log(row);
+    },
     reportForm () {
       this.$refs.baobiao.init({
         elseParams: {
@@ -706,31 +714,12 @@ export default {
 
       return _val || row[item.columnName];
     },
-    handleSearchFrom () {
-      let arr = [];
-      this.searchList.forEach((item) => {
-        const arr1 =
-          this.$refs[`resiSearch${item.itemGroupId}`][0].handleSearch();
-        arr = arr.concat(arr1);
-        // console.log('search-----refs', this.$refs[`resiSearch${item.itemGroupId}`])
-      });
-      console.log("search-----refs", this.$refs);
-      console.log("search-----arr", arr);
-      this.currentPage = 1;
-      this.conditions = arr;
-      this.getTableData();
-    },
-    handleSearch (val) {
-      console.log("searchhh--", val);
-      this.currentPage = 1;
-      this.conditions = val;
-      this.getTableData();
-    },
+  
+   
     resetSearchForm (formName) {
       // for(const n in this.form) {
       //   this.form[n] = ''
       // }
-      // this.handleSearch()
       this.searchList.forEach((item) => {
         this.$refs[`resiSearch${item.itemGroupId}`][0].resetForm();
         // console.log('search-----refs', this.$refs[`resiSearch${item.itemGroupId}`])
@@ -933,6 +922,7 @@ export default {
       console.log(tab, event);
     },
     async handleLook (row) {
+      console.log();
       this.lookInfo.userId = row.icResiUserId;
       this.lookInfo.gridName = row.GRID_ID;
       this.showedPeopleMoreInfo = true;
@@ -1057,12 +1047,35 @@ export default {
       const arr = await this.formetForm();
       if (arr) this.submitEdit(arr);
     },
+
     async handleSUbmit () {
+      this.$refs.baseForm.submit_from()
+      for (const key of this.$refs.baseForm) {
+          if(typeof key == "Object"){
+                console.log(key);
+          }
+      }
       // console.log(this,$refs.baseForm);
       // const arr = await this.formetForm();
-      // if (arr) this.submitAdd(arr);
-      this.dialogVisible = false;
-
+      
+      // this.$refs.baseForm.tabsList.forEach(item=>{
+      //     if(item.id){
+      //         console.log(item.id);
+      //     }
+      // })
+      // console.log(this.$refs.baseForm.tabsList);
+      //   if(this.$refs.baseForm.form.hobbyInfoDto.hobbyCode.length != 0 || this.$refs.baseForm.form.volunteerDto.volunteerCategory.length != 0 ||this.$refs.baseForm.form.specialDto.specialCategoryCode.length != 0){
+      //     this.$refs.baseForm.form.hobbyInfoDto.hobbyCode = this.$refs.baseForm.form.hobbyInfoDto.hobbyCode.join(',')
+      //     this.$refs.baseForm.form.volunteerDto.volunteerCategory = this.$refs.baseForm.form.volunteerDto.volunteerCategory.join(',')
+      //     this.$refs.baseForm.form.specialDto.specialCategoryCode = this.$refs.baseForm.form.specialDto.specialCategoryCode.join(',')
+      //   }else {
+      //    this.$refs.baseForm.form.hobbyInfoDto.hobbyCode = ''
+      //     this.$refs.baseForm.form.volunteerDto.volunteerCategory=''
+      //     this.$refs.baseForm.form.specialDto.specialCategoryCode = ''
+      //   }
+        // this.submitAdd(this.$refs.baseForm.form);
+        console.log(this.$refs.baseForm.form);
+        // this.dialogVisible = false;
     },
     handleDel (row) {
       let params = {
@@ -1107,24 +1120,21 @@ export default {
     async submitAdd (arr) {
       this.btnLoading = true;
       await this.$http
-        .post("/epmetuser/icresiuser/add", arr)
+        .post("/actual/base/residentBaseInfo/save", arr)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
           } else {
             this.$message.success("提交成功");
             // this.$refs[formName].resetFields();
-            this.$refs.baseForm.resetForm();
-            this.tabsList.forEach((item) => {
-              this.$refs["group" + item.groupId][0].resetForm();
-            });
-            this.getTableData();
+            
             this.dialogVisible = false;
           }
         })
         .catch(() => {
           return this.$message.error("网络错误");
         });
+      // console.log(this.$refs.baseForm.form);
       this.btnLoading = false;
     },
     async submitEdit (arr) {
@@ -1150,71 +1160,21 @@ export default {
         });
       this.btnLoading = false;
     },
-    async getTableHeader () {
-      await this.$http
-        .post("/oper/customize/icform/tableheaders", {
-          formCode: "resi_base_info",
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.tableHeader = res.data;
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-    },
     async getTableData () {
-      this.tableLoading = true;
-      // console.log(this.conditions);
-      // if(this.conditions.columnName){
-      //   columnValue
-      // }
-      // var index =  this.conditions.findIndex(item=>item.columnName === 'BIRTHDAY' )
-      // this.conditions.filter(item=>{
-      //   if(item.columnName === "BIRTHDAY") {
-      //     console.log(this.$refs.resiSearch.endPickerTime);
-      //     item.columnValue = [this.$refs.resiSearch.endPickerTime,this.$refs.resiSearch.startPickerTime] 
-      //   }
-      // })
-      // console.log(this.conditions);
-      let timer = this.$refs.resiSearch.handelWatchStartDate()
-
-      console.log(timer, '派发');
-      let params = {
-        formCode: "resi_base_info",
-        pageNo: this.currentPage,
-        pageSize: this.pageSize,
-        conditions: this.conditions,
+      try {
+        let params = {
+          pageNo: this.currentPage,
+          pageSize: this.pageSize,
       };
-      await this.$http
-        .post("/epmetuser/icresiuser/listresi", params)
-        .then(({ data: res }) => {
-
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.tableData = res.data.list.map((item) => {
-              return {
-                ...item,
-                isChecked: this.filterEdit(item.ORG_ID),
-              };
-            });
-            let _selAllFlagDisabled = true;
-            this.tableData.forEach((item) => {
-              if (item.isChecked) _selAllFlagDisabled = false;
-            });
-            this.selAllFlagDisabled = _selAllFlagDisabled;
-            this.total = res.data.total;
-          }
-        })
-        .catch(() => {
-          console.log(this.conditions);
-          return this.$message.error("网络错误");
-
-        });
+      // this.tableLoading = true;
+       const { data } =  await this.$http.post("/actual/base/residentBaseInfo/page", params)
+        this.tableData =data.data.list
+        console.log(this.tableData);
+      console.log(data,'data');
+      } catch (error) {
+        console.log(error);
+      }
+     
       this.tableLoading = false;
     },
     getrowInfo (id) {
@@ -1312,48 +1272,7 @@ export default {
         });
       return options;
     },
-    async getSearchList () {
-      //  /oper/customize/icform/conditionlist
-      await this.$http
-        .post("/oper/customize/icform/conditionlist-bygroup", {
-          formCode: "resi_base_info",
-          dynamic: true,
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            console.log("获取查询详情成功--sss", res);
-
-            res.data.forEach((item) => {
-              item.queryItemList.forEach((n) => {
-                if (n.optionSourceType === "remote") {
-                  this.getOptionsList(n.optionSourceValue).then((res) => {
-                    n.options = this.getTreeData(res);
-                  });
-                  // console.log('')
-                } else if (n.itemType == "radio" && n.options.length == 0) {
-                  n.options = [
-                    {
-                      label: "是",
-                      value: "1",
-                    },
-                    {
-                      label: "否",
-                      value: "0",
-                    },
-                  ];
-                }
-              });
-            });
-            this.searchList = res.data;
-            console.log(this.searchList);
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-    },
+    
     getTreeData (data) {
       if (!Array.isArray(data)) return [];
       let arr = data.map((item) => {