diff --git a/src/assets/scss/pages/smartImport.scss b/src/assets/scss/pages/smartImport.scss
index ab75a4236..1bf746981 100644
--- a/src/assets/scss/pages/smartImport.scss
+++ b/src/assets/scss/pages/smartImport.scss
@@ -13,7 +13,9 @@
         }
     }
   }
-
+.font_color_red{
+  color: red;
+}
   .content_box{
     display: flex;
     .left{
@@ -105,5 +107,4 @@
     to {
       transform: rotate(-360deg);
     }
-  }
-  
\ No newline at end of file
+  }
\ No newline at end of file
diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue
index a2cc77401..7bdd94cca 100644
--- a/src/views/components/addResi.vue
+++ b/src/views/components/addResi.vue
@@ -1,611 +1,288 @@
 <template>
-  <div class="div_form">
-    <div class="form">
-      <el-form :model="form" :rules="rules" label-width="105px" ref="addForm">
-        <h5 style="margin-top: 6px">基础信息登记</h5>
-        <div class="basicInfo">
-          <el-row type="flex" justify="space-between">
-            <el-col :span="6">
-              <el-form-item
-                label="姓名"
-                prop="baseInfoDto.name"
-                class="font-color-orange"
-              >
-                <el-input
-                  class="list_item_width_1"
-                  v-model="form.baseInfoDto.name"
-                  placeholder="请输入内容"
-                  size="small"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item
-                label="证件类型"
-                prop="baseInfoDto.idType"
-                class="font-color-orange"
-              >
-                <el-select
-                  v-model="form.baseInfoDto.idType"
-                  placeholder="请选择"
-                  size="small"
-                  class="list_item_width_1"
-                  clearable
-                >
-                  <el-option
-                    v-for="(item, index) in idTypeList"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item
-                label="证件号"
-                prop="baseInfoDto.idNum"
-                class="font-color-orange"
-              >
-                <el-input
-                  v-model="form.baseInfoDto.idNum"
-                  placeholder="请输入内容"
-                  clearable
-                  size="small"
-                  class="list_item_width_1"
-                  @blur="handleValidBlur"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item
-                label="国籍"
-                prop="baseInfoDto.nationality"
-                class="font-color-orange"
-              >
-                <el-select
-                  v-model="form.baseInfoDto.nationality"
-                  placeholder="请选择"
-                  size="small"
-                  class="list_item_width_1"
-                  clearable
-                >
-                  <el-option
-                    v-for="(item, index) in dicts.nationalityList"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row type="flex" justify="space-between">
-            <el-col :span="6">
-              <el-form-item
-                label="联系电话"
-                prop="baseInfoDto.mobile"
-                class="font-color-orange"
-              >
-                <el-input
-                  class="list_item_width_1"
-                  v-model="form.baseInfoDto.mobile"
-                  placeholder="请输入内容"
-                  size="small"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="性别">
-                <el-select
-                  v-model="form.baseInfoDto.gender"
-                  placeholder="请选择"
-                  size="small"
-                  class="list_item_width_1"
-                  clearable
-                >
-                  <el-option
-                    v-for="(item, index) in genderList"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="出生日期">
-                <el-date-picker
-                  v-model.trim="form.baseInfoDto.birthday"
-                  class="list_item_width_1"
-                  type="date"
-                  size="small"
-                  clearable
-                  placeholder="选择日期"
-                  format="yyyy 年 MM 月 dd 日"
-                  value-format="yyyy-MM-dd"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="民族">
-                <el-select
-                  v-model="form.baseInfoDto.nation"
-                  placeholder="请选择"
-                  size="small"
-                  class="list_item_width_1"
-                  clearable
-                >
-                  <el-option
-                    v-for="(item, index) in dicts.nationList"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row type="flex" justify="space-between">
-            <el-col :span="6">
-              <el-form-item label="文化程度">
-                <el-select
-                  v-model="form.eduInfoDto.cultureLevel"
-                  placeholder="请选择"
-                  size="small"
-                  class="list_item_width_1"
-                  clearable
-                >
-                  <el-option
-                    v-for="(item, index) in dicts.educationList"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="婚姻状况">
-                <el-select
-                  v-model="form.familyInfoDto.marriage"
-                  placeholder="请选择"
-                  size="small"
-                  class="list_item_width_1"
-                  clearable
-                >
-                  <el-option
-                    v-for="(item, index) in dicts.marriageList"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
-                    @click.native="handelClickMarriage(item.value)"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col
-              :span="6"
-              v-if="
-                form.familyInfoDto.marriage == 'chuhun' ||
-                form.familyInfoDto.marriage == 'zaihun' ||
-                form.familyInfoDto.marriage == 'fuhun'
-              "
-            >
-              <el-form-item label="配偶情况">
-                <el-select
-                  v-model="form.familyInfoDto.spouseSituation"
-                  placeholder="请选择"
-                  size="small"
-                  class="list_item_width_1"
-                  clearable
-                >
-                  <el-option
-                    v-for="(item, index) in dicts.spouseSituationList"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="籍贯">
-                <el-input
-                  v-model="form.baseInfoDto.nativePlace"
-                  placeholder="请输入内容"
-                  clearable
-                  size="small"
-                  class="list_item_width_1"
-                ></el-input>
-                <el-radio-group
-                  v-model="form.baseInfoDto.localResidenceFlag"
-                  style="margin-left: 10px"
-                >
-                  <el-radio
-                    :label="1"
-                    @click.native.prevent="handleLocalRadio($event, 1)"
-                    >本地</el-radio
-                  >
-                  <el-radio
-                    :label="0"
-                    @click.native.prevent="handleLocalRadio($event, 0)"
-                    v-show="false"
-                    >非本地</el-radio
-                  >
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-form-item label="备注">
-            <el-input
-              type="textarea"
-              class="item_width_1"
-              :rows="3"
-              placeholder="请输入内容"
-              v-model="form.baseInfoDto.remark"
-              clearable
-            >
-            </el-input>
-          </el-form-item>
-        </div>
-        <h5>居住信息登记</h5>
-        <div class="house">
-          <section
-            v-for="(item, index) in this.form.resideInfoDtos"
-            :key="index"
-          >
-            <el-row type="flex" justify="start" style="margin-bottom: 24px">
-              <el-col :span="8">
-                <el-form-item
-                  label="所属组织"
-                  class="font-color-orange"
-                  style="margin: 0px"
-                  :prop="`resideInfoDtos[${index}].gridId`"
-                  :rules="[
-                    {
-                      required: true,
-                      message: '请选择所属组织',
-                      trigger: 'blur',
-                    },
-                  ]"
-                >
-                  <el-cascader
-                    class="u-item-width-agency"
-                    ref="myCascader"
-                    clearable
-                    size="small"
-                    v-model="form.resideInfoDtos[index].gridId"
-                    :options="orgOptions"
-                    :props="orgOptionProps"
-                    @change="handleChangeAgency(index)"
-                  ></el-cascader>
-                </el-form-item>
-              </el-col>
-              <el-col :span="16" style="display: flex">
-                <el-form-item
-                  :prop="`resideInfoDtos[${index}].villageId`"
-                  label="所属房屋"
-                  style="margin: 0px"
-                  label-width="100px"
-                  class="font-color-orange"
-                  :rules="[
-                    { required: true, message: '请选择小区', trigger: 'blur' },
-                  ]"
-                >
-                  <el-select
-                    v-model.trim="form.resideInfoDtos[index].villageId"
-                    placeholder="请选择小区"
-                    size="small"
-                    class="u-item-width-communitycascader f-bto0"
-                    clearable
-                  >
-                    <el-option
-                      v-for="item in item.optionsV"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                      @click.native="handleChangeV(index)"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item
-                  :prop="`resideInfoDtos[${index}].buildId`"
-                  label-width="0"
-                  style="margin: 0px"
-                  :rules="[
-                    { required: true, message: '请选择楼栋', trigger: 'blur' },
-                  ]"
-                >
-                  <el-select
-                    v-model.trim="form.resideInfoDtos[index].buildId"
-                    placeholder="楼号"
-                    size="small"
-                    clearable
-                    @change="handleChangeB(index)"
-                    class="u-item-width-buildcascader f-bto0"
-                  >
-                    <el-option
-                      v-for="item in item.optionsB"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item
-                  :prop="`resideInfoDtos[${index}].unitId`"
-                  label-width="0"
-                  style="margin: 0px"
-                  :rules="[
-                    { required: true, message: '请选择单元', trigger: 'blur' },
-                  ]"
-                >
-                  <el-select
-                    v-model.trim="form.resideInfoDtos[index].unitId"
-                    placeholder="单元"
-                    size="small"
-                    clearable
-                    class="u-item-width-buildcascader f-bto0"
-                    @change="handleChangeD(index)"
-                  >
-                    <el-option
-                      v-for="item in item.optionsD"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item
-                  :prop="`resideInfoDtos[${index}].homeId`"
-                  label-width="0"
-                  style="margin: 0px"
-                  :rules="[
-                    { required: true, message: '请选择房屋', trigger: 'blur' },
-                  ]"
-                >
-                  <el-select
-                    v-model.trim="form.resideInfoDtos[index].homeId"
-                    placeholder="房号"
-                    size="small"
-                    clearable
-                    class="u-item-width-buildcascader f-bto0"
-                    @change="handleChangeH(index)"
-                  >
-                    <el-option
-                      v-for="item in item.optionsH"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-button
-                  type="primary"
-                  size="mini"
-                  icon="el-icon-plus"
-                  circle
-                  @click="handelClickAddHouse"
-                  style="margin-left: 16px; height: 30px"
-                ></el-button>
-                <el-button
-                  type="danger"
-                  v-if="form.resideInfoDtos.length > 1"
-                  size="small"
-                  icon="el-icon-minus"
-                  @click="handelClickDelHouse(index)"
-                  style="height: 30px"
-                  circle
-                >
-                </el-button>
-              </el-col>
-            </el-row>
-            <el-row type="flex" justify="space-between">
-              <el-col :span="6">
-                <el-form-item label="人房关系" class="font-color-blue">
-                  <el-select
-                    v-model="form.resideInfoDtos[index].resiHouseRel"
-                    placeholder="请选择"
-                    size="small"
-                    class="list_item_width_1"
-                    @change="handelChangeResiHouseRel($event, index)"
-                    clearable
-                  >
-                    <el-option
-                      v-for="(item, i) in dicts.resiHouseRelList"
-                      :key="i"
-                      :label="item.label"
-                      :value="item.value"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="人户状况" class="font-color-blue">
-                  <el-select
-                    v-model="form.resideInfoDtos[index].householdSituation"
-                    placeholder="请选择"
-                    size="small"
-                    class="list_item_width_1"
-                    clearable
-                  >
-                    <el-option
-                      v-for="(item, index) in dicts.householdSituationList"
-                      :key="index"
-                      :label="item.label"
-                      :value="item.value"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item
-                  label="与户主关系"
-                  class="font-color-blue font-color-blue2"
-                >
-                  <el-select
-                    v-model="form.resideInfoDtos[index].houseHolderRel"
-                    placeholder="请选择"
-                    size="small"
-                    class="list_item_width_1"
-                    clearable
-                  >
-                    <el-option
-                      v-for="(item, index) in dicts.houseHolderRelList"
-                      :key="index"
-                      :label="item.label"
-                      :value="item.value"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col
-                :span="6"
-                v-if="form.resideInfoDtos[index].householdSituation == 'rzhbz'"
-              >
-                <el-form-item label="户籍所在地">
-                  <el-input
-                    class="list_item_width_1"
-                    v-model="form.resideInfoDtos[index].placeOfDomicile"
-                    placeholder="请输入内容"
-                    size="small"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col
-                :span="6"
-                v-else-if="
-                  form.resideInfoDtos[index].householdSituation == 'hzrbz'
-                "
-              >
-                <el-form-item label="现居住地址">
-                  <el-input
-                    class="list_item_width_1"
-                    v-model="form.resideInfoDtos[index].currentResidence"
-                    placeholder="请输入内容"
-                    size="small"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col
-                :span="6"
-                v-else-if="
-                  form.resideInfoDtos[index].householdSituation == 'rhdbz'
-                "
-              >
-                <el-form-item label="迁出时间">
-                  <el-date-picker
-                    v-model.trim="form.resideInfoDtos[index].outOfTime"
-                    class="list_item_width_1"
-                    type="date"
-                    size="small"
-                    clearable
-                    placeholder="选择日期"
-                    format="yyyy 年 MM 月 dd 日"
-                    value-format="yyyy-MM-dd"
-                  >
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6" v-else> </el-col>
-            </el-row>
-          </section>
-        </div>
-        <h5>拓展信息登记</h5>
-        <div class="expand">
-          <el-row type="flex" justify="space-between">
-            <el-col :span="6">
-              <el-form-item label="宗教信仰">
-                <el-input
-                  class="list_item_width_1"
-                  v-model="form.religionDto.religion"
-                  placeholder="请输入内容"
-                  size="small"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="就业状态" class="font-color-blue">
-                <el-select
-                  v-model="form.workInfoDto.careerStatus"
-                  placeholder="请选择"
-                  size="small"
-                  class="list_item_width_1"
-                  clearable
-                >
-                  <el-option
-                    v-for="(item, index) in dicts.careerStatusList"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
-                    @click.native="handelClickCareerStatus(item.value)"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col
-              :span="6"
-              v-if="
-                form.workInfoDto.careerStatus >= 1 &&
-                form.workInfoDto.careerStatus <= 5
-              "
-            >
-              <el-form-item label="工作单位">
-                <el-input
-                  class="list_item_width_1"
-                  v-model="form.workInfoDto.workUnit"
-                  placeholder="请输入内容"
-                  size="small"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col
-              :span="6"
-              v-if="
-                form.workInfoDto.careerStatus >= 1 &&
-                form.workInfoDto.careerStatus <= 5
-              "
-            >
-              <el-form-item label="职业">
-                <el-input
-                  class="list_item_width_1"
-                  v-model="form.workInfoDto.occupation"
-                  placeholder="请输入内容"
-                  size="small"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col
-              :span="6"
-              v-if="
-                (form.workInfoDto.careerStatus == 0 ||
-                  form.workInfoDto.careerStatus == 6) &&
-                form.workInfoDto.careerStatus
-              "
-            >
-              <el-form-item label="原工作单位">
-                <el-input
-                  class="list_item_width_1"
-                  v-model="form.unemployedDto.originWorkUnit"
-                  placeholder="请输入内容"
-                  size="small"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
+    <div class="div_form">
+        <div class="form">
+            <el-form :model="form" :rules="rules" label-width="105px" ref="addForm">
+                <h5 style="margin-top: 6px;">基础信息登记</h5>
+                <div class="basicInfo">
+                    <el-row type="flex" justify="space-between">
+                        <el-col :span="6">
+                            <el-form-item label="姓名" prop="baseInfoDto.name" class="font-color-orange">
+                                <el-input class="list_item_width_1" v-model="form.baseInfoDto.name" placeholder="请输入内容"
+                                    size="small" clearable></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="证件类型" prop="baseInfoDto.idType" class="font-color-orange">
+                                <el-select v-model="form.baseInfoDto.idType" placeholder="请选择" size="small"
+                                    class="list_item_width_1" clearable>
+                                    <el-option v-for="(item, index) in idTypeList" :key="index" :label="item.label"
+                                        :value="item.value" @click.native="handelCLickIdType(item.value)"></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="证件号" prop="baseInfoDto.idNum" class="font-color-orange">
+                                <el-input v-model="form.baseInfoDto.idNum" placeholder="请输入内容" clearable size="small"
+                                    class="list_item_width_1" @blur="handleValidBlur"></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="国籍" prop="baseInfoDto.nationality" class="font-color-orange">
+                                <el-select v-model="form.baseInfoDto.nationality" placeholder="请选择" size="small"
+                                    class="list_item_width_1" clearable>
+                                    <el-option v-for="(item, index) in dicts.nationalityList" :key="index"
+                                        :label="item.label" :value="item.value"></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row type="flex" justify="space-between">
+                        <el-col :span="6">
+                            <el-form-item label="联系电话" prop="baseInfoDto.mobile" class="font-color-orange">
+                                <el-input class="list_item_width_1" v-model="form.baseInfoDto.mobile"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="性别">
+                                <el-select v-model="form.baseInfoDto.gender" placeholder="请选择" size="small"
+                                    class="list_item_width_1" clearable>
+                                    <el-option v-for="(item, index) in genderList" :key="index" :label="item.label"
+                                        :value="item.value"></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="出生日期">
+                                <el-date-picker v-model.trim="form.baseInfoDto.birthday" class="list_item_width_1"
+                                    type="date" size="small" clearable placeholder="选择日期" format="yyyy 年 MM 月 dd 日"
+                                    value-format="yyyy-MM-dd">
+                                </el-date-picker>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="民族">
+                                <el-select v-model="form.baseInfoDto.nation" placeholder="请选择" size="small"
+                                    class="list_item_width_1" clearable>
+                                    <el-option v-for="(item, index) in dicts.nationList" :key="index"
+                                        :label="item.label" :value="item.value"></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row type="flex" justify="space-between">
+                        <el-col :span="6">
+                            <el-form-item label="文化程度">
+                                <el-select v-model="form.eduInfoDto.cultureLevel" placeholder="请选择" size="small"
+                                    class="list_item_width_1" clearable>
+                                    <el-option v-for="(item, index) in dicts.educationList" :key="index"
+                                        :label="item.label" :value="item.value"></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="婚姻状况">
+                                <el-select v-model="form.familyInfoDto.marriage" placeholder="请选择" size="small"
+                                    class="list_item_width_1" clearable>
+                                    <el-option v-for="(item, index) in dicts.marriageList" :key="index"
+                                        :label="item.label" :value="item.value"
+                                        @click.native="handelClickMarriage(item.value)"></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6"
+                            v-if="form.familyInfoDto.marriage == 'chuhun' || form.familyInfoDto.marriage == 'zaihun' || form.familyInfoDto.marriage == 'fuhun'">
+                            <el-form-item label="配偶情况">
+                                <el-select v-model="form.familyInfoDto.spouseSituation" placeholder="请选择" size="small"
+                                    class="list_item_width_1" clearable>
+                                    <el-option v-for="(item, index) in dicts.spouseSituationList" :key="index"
+                                        :label="item.label" :value="item.value"></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="籍贯">
+                                <el-input v-model="form.baseInfoDto.nativePlace" placeholder="请输入内容" clearable
+                                    size="small" class="list_item_width_1"></el-input>
+                                <el-radio v-model="form.baseInfoDto.localResidenceFlag" style="margin-left: 10px;"
+                                    @click.native="handleLocalRadio($event)" :label="1">本地</el-radio>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-form-item label="备注">
+                        <el-input type="textarea" class="item_width_1" :rows="3" placeholder="请输入内容"
+                            v-model="form.baseInfoDto.remark" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+                <h5>居住信息登记</h5>
+                <div class="house">
+                    <section v-for="(item, index) in this.form.resideInfoDtos" :key="index">
+                        <el-row type="flex" justify="start" style="margin-bottom: 24px;">
+                            <el-col :span="8">
+                                <el-form-item label="所属组织" class="font-color-orange" style="margin:0px "
+                                    :prop="`resideInfoDtos[${index}].gridId`" :rules="[
+                { required: true, message: '请选择所属组织', trigger: 'blur' },
+            ]">
+                                    <el-cascader class="u-item-width-agency" ref="myCascader" clearable size="small"
+                                        v-model="form.resideInfoDtos[index].gridId" :options="orgOptions"
+                                        :props="orgOptionProps" @change="handleChangeAgency(index)"></el-cascader>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="16" style="display: flex;">
+                                <el-form-item :prop="`resideInfoDtos[${index}].villageId`" label="所属房屋"
+                                    style="margin:0px " label-width="100px" class="font-color-orange" :rules="[
+                { required: true, message: '请选择小区', trigger: 'blur' },
+            ]">
+                                    <el-select v-model.trim="form.resideInfoDtos[index].villageId" placeholder="请选择小区"
+                                        size="small" class="u-item-width-communitycascader f-bto0" clearable>
+                                        <el-option v-for="item in item.optionsV" :key="item.value" :label="item.label"
+                                            :value="item.value" @click.native="handleChangeV(index)">
+                                        </el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item :prop="`resideInfoDtos[${index}].buildId`" label-width="0"
+                                    style="margin:0px" :rules="[
+                { required: true, message: '请选择楼栋', trigger: 'blur' },
+            ]">
+                                    <el-select v-model.trim="form.resideInfoDtos[index].buildId" placeholder="楼号"
+                                        size="small" clearable @change="handleChangeB(index)"
+                                        class="u-item-width-buildcascader f-bto0">
+                                        <el-option v-for="item in item.optionsB" :key="item.value" :label="item.label"
+                                            :value="item.value">
+                                        </el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item :prop="`resideInfoDtos[${index}].unitId`" label-width="0"
+                                    style="margin:0px" :rules="[
+                { required: true, message: '请选择单元', trigger: 'blur' },
+            ]">
+                                    <el-select v-model.trim="form.resideInfoDtos[index].unitId" placeholder="单元"
+                                        size="small" clearable class="u-item-width-buildcascader f-bto0"
+                                        @change="handleChangeD(index)">
+                                        <el-option v-for="item in item.optionsD" :key="item.value" :label="item.label"
+                                            :value="item.value">
+                                        </el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item :prop="`resideInfoDtos[${index}].homeId`" label-width="0"
+                                    style="margin:0px " :rules="[
+                { required: true, message: '请选择房屋', trigger: 'blur' },
+            ]">
+                                    <el-select v-model.trim="form.resideInfoDtos[index].homeId" placeholder="房号"
+                                        size="small" clearable class="u-item-width-buildcascader f-bto0"
+                                        @change="handleChangeH(index)">
+                                        <el-option v-for="item in item.optionsH" :key="item.value" :label="item.label"
+                                            :value="item.value">
+                                        </el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-button type="primary" size="mini" icon="el-icon-plus" circle
+                                    @click="handelClickAddHouse" style="margin-left: 16px; height: 30px;"></el-button>
+                                <el-button type="danger" v-if="form.resideInfoDtos.length > 1" size="small"
+                                    icon="el-icon-minus" @click="handelClickDelHouse(index)" style="height: 30px;"
+                                    circle>
+                                </el-button>
+                            </el-col>
+
+                        </el-row>
+                        <el-row type="flex" justify="space-between">
+                            <el-col :span="6">
+                                <el-form-item label="人房关系" class="font-color-blue">
+                                    <el-select v-model="form.resideInfoDtos[index].resiHouseRel" placeholder="请选择"
+                                        size="small" class="list_item_width_1"
+                                        @change="handelChangeResiHouseRel($event, index)" clearable>
+                                        <el-option v-for="(item, i) in dicts.resiHouseRelList" :key="i"
+                                            :label="item.label" :value="item.value"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="人户状况" class="font-color-blue">
+                                    <el-select v-model="form.resideInfoDtos[index].householdSituation" placeholder="请选择"
+                                        size="small" class="list_item_width_1" clearable>
+                                        <el-option v-for="(item, index) in dicts.householdSituationList" :key="index"
+                                            :label="item.label" :value="item.value"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="与户主关系" class="font-color-blue font-color-blue2">
+                                    <el-select v-model="form.resideInfoDtos[index].houseHolderRel" placeholder="请选择"
+                                        size="small" class="list_item_width_1" clearable>
+                                        <el-option v-for="(item, index) in dicts.houseHolderRelList" :key="index"
+                                            :label="item.label" :value="item.value"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6" v-if="form.resideInfoDtos[index].householdSituation == 'rzhbz'">
+                                <el-form-item label="户籍所在地">
+                                    <el-input class="list_item_width_1"
+                                        v-model="form.resideInfoDtos[index].placeOfDomicile" placeholder="请输入内容"
+                                        size="small" clearable></el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6" v-else-if="form.resideInfoDtos[index].householdSituation == 'hzrbz'">
+                                <el-form-item label="现居住地址">
+                                    <el-input class="list_item_width_1"
+                                        v-model="form.resideInfoDtos[index].currentResidence" placeholder="请输入内容"
+                                        size="small" clearable></el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6" v-else-if="form.resideInfoDtos[index].householdSituation == 'rhdbz'">
+                                <el-form-item label="迁出时间">
+                                    <el-date-picker v-model.trim="form.resideInfoDtos[index].outOfTime"
+                                        class="list_item_width_1" type="date" size="small" clearable placeholder="选择日期"
+                                        format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd">
+                                    </el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6" v-else>
+                            </el-col>
+                        </el-row>
+
+                    </section>
+                </div>
+                <h5>拓展信息登记</h5>
+                <div class="expand">
+                    <el-row type="flex" justify="space-between">
+                        <el-col :span="6">
+                            <el-form-item label="宗教信仰">
+                                <el-input class="list_item_width_1" v-model="form.religionDto.religion"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="就业状态" class="font-color-blue">
+                                <el-select v-model="form.workInfoDto.careerStatus" placeholder="请选择" size="small"
+                                    class="list_item_width_1" clearable>
+                                    <el-option v-for="(item, index) in dicts.careerStatusList" :key="index"
+                                        :label="item.label" :value="item.value"
+                                        @click.native="handelClickCareerStatus(item.value)"></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6"
+                            v-if="form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
+                            <el-form-item label="工作单位">
+                                <el-input class="list_item_width_1" v-model="form.workInfoDto.workUnit"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6"
+                            v-if="form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
+                            <el-form-item label="职业">
+                                <el-input class="list_item_width_1" v-model="form.workInfoDto.occupation"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6"
+                            v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                            <el-form-item label="原工作单位">
+                                <el-input class="list_item_width_1" v-model="form.unemployedDto.originWorkUnit"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item>
+                        </el-col>
 
             <el-col
               :span="6"
@@ -1583,316 +1260,286 @@ export default {
           this.form.resideInfoDtos[index].unitId = "";
           this.form.resideInfoDtos[index].homeId = "";
 
-          this.getValiheList(index);
-        } else {
-          // this.selGridId = []
-          this.form.resideInfoDtos[index].gridId = "";
-          this.form.resideInfoDtos[index].agencyId = "";
-          this.$message.info("请选择网格");
-          return false;
-        }
-      }
-    },
-    getValiheList(index) {
-      console.log(this.form.resideInfoDtos[index].gridId, "小区接口");
-      console.log(this.form.resideInfoDtos);
-      const { user } = this.$store.state;
-      this.$http
-        .post("/actual/base/communityQuarters/listQuartersOptions", {
-          gridId: this.form.resideInfoDtos[index].gridId,
-          agencyId: user.agencyId,
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.form.resideInfoDtos[index].optionsV = [];
-            this.form.resideInfoDtos[index].optionsV.push(...res.data);
-          }
-        })
-        .catch((err) => {
-          console.log(err);
-          return this.$message.error("网络错误");
-        });
-    },
-    getBuildList(index) {
-      this.$http
-        .post("/actual/base/communityBuilding/buildingoption", {
-          quartersId: this.form.resideInfoDtos[index].villageId,
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.form.resideInfoDtos[index].optionsB = res.data;
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-    },
-    getUniList(index) {
-      this.$http
-        .post("/actual/base/communityBuildingUnit/unitoption", {
-          buildingId: this.form.resideInfoDtos[index].buildId,
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.form.resideInfoDtos[index].optionsD = res.data;
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-    },
-    getHouseList(index) {
-      this.$http
-        .post("/actual/base/communityHouse/houseoption", {
-          unitId: this.form.resideInfoDtos[index].unitId,
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.form.resideInfoDtos[index].optionsH = res.data;
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-    },
-    handelClickAddHouse() {
-      this.form.resideInfoDtos.push({
-        agencyName: this.$store.state.user.agencyName,
-        agencyId: this.$store.state.user.agencyId,
-        gridId: null, //所属网格id
-        villageId: null, //小区id
-        buildId: null, //楼栋id
-        unitId: null, //单元id
-        moveOutFlag: null,
-        outOfTime: null, //迁出时间
-        homeId: null, //房屋id
-        placeOfDomicile: null, //户籍所在地
-        currentResidence: null, //现居住地
-        householdSituation: null, //人户状况
-        houseHolderRel: null, //与户主关系
-        resiHouseRel: null, //人房关系
-        optionsV: [],
-        optionsB: [],
-        optionsH: [],
-        optionsD: [],
-      });
-    },
-    handelClickDelHouse(i) {
-      this.form.resideInfoDtos = this.form.resideInfoDtos.filter(
-        (item, index) => index != i
-      );
-    },
-    handleValidBlur() {
-      if (this.form.baseInfoDto.idType != 1) return;
-      if (
-        !isCard(this.form.baseInfoDto.idNum) &&
-        !isPassport(this.form.baseInfoDto.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];
-      }
+                    this.getValiheList(index);
+                } else {
+                    // this.selGridId = []
+                    this.form.resideInfoDtos[index].gridId = ''
+                    this.form.resideInfoDtos[index].agencyId = ''
+                    this.$message.info('请选择网格')
+                    return false
+                }
+
+            }
 
-      if (
-        this.form.baseInfoDto.idNum.length === 18 ||
-        this.form.baseInfoDto.idNum.length === 15
-      ) {
-        const _id = this.form.baseInfoDto.idNum.substr(0, 6);
-        const { sex, birth, age } = computedCard(this.form.baseInfoDto.idNum);
-        this.form.baseInfoDto.birthday = birth;
-        this.form.baseInfoDto.gender = sex == 1 ? "1" : "2";
-        this.form.baseInfoDto.categoryInfo.oldPeopleFlag = age >= 60 ? 1 : 0;
-        // this.form.IS_BDHJ = huji == _id ? '1' : ''
-        // 身份证前端验证角色方法 因原型没有注释
-        // this.validateIdcard(this.form.idNum)
-      }
-    },
-    handleLocalRadio(e, value) {
-      if (e.target.type === "radio") return;
-      this.form.baseInfoDto.localResidenceFlag =
-      this.form.baseInfoDto.localResidenceFlag === value ? 0 : 1;
-    },
-    handelClickMarriage() {
-      this.form.familyInfoDto.spouseSituation = null;
-    },
-    handelClickelderly() {
-      this.form.familyInfoDto.elderlyRelation = null;
-      this.form.familyInfoDto.dependantMobile = null;
-    },
-    handelClickCareerStatus(val) {
-      this.form.unemployedDto = {
-        originWorkUnit: null, //原工作单位
-        unemploymentTime: null, //失业时间yyyy-MM-dd
-        unemploymentNum: null, //失业证号
-        employmentNum: null, //再就业优惠证号
-        specialSkill: null, //技术特长
-        unempCompensationFlag: null, //是否领取失业补助金
-        unemploymentReason: null, //失业原因【字典表】code
-        employmentHardFlag: null, //是否就业困难对象；1是0不是
-        employmentWish: null, //劳动能力就业愿望
-      };
-      this.form.workInfoDto = {
-        careerStatus: val, //就业状况
-        workUnit: null, //工作单位
-        occupation: null, //职业
-      };
-      if (val == 0) {
-        this.form.baseInfoDto.categoryInfo.unemployedFlag = 1;
-      } else {
-        this.form.baseInfoDto.categoryInfo.unemployedFlag = 0;
-      }
-    },
-    handlerCancle() {
-      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
-        (item) => item.name !== "add-resi"
-      );
-      let tab =
-        this.$store.state.contentTabs[this.$store.state.contentTabs.length - 1];
-      this.$router.push({
-        name: tab.name,
-        params: { ...tab.params },
-        query: { ...tab.query },
-      });
-    },
-    handleClickSubmit(house) {
-      this.$refs["addForm"].validate((valid) => {
-        if (valid) {
-          this.form.resideInfoDtos.forEach((item) => {
-            delete item.optionsV;
-            delete item.optionsB;
-            delete item.optionsH;
-            delete item.optionsD;
-          });
-          this.submitForm(house);
-        }
-      });
-    },
-    async submitForm(house) {
-      try {
-        let url = "/actual/base/residentBaseInfo/save";
-        let parm = {
-          ...this.form,
-        };
-        let { code, data, msg } = await requestPost(url, parm);
-        if (code == 0) {
-          if (house != "house") {
-            this.$message.success("保存成功");
-            this.$refs["addForm"].resetFields();
-            this.handlerCancle();
-          } else {
-            this.$message.success("保存成功");
-            let homeArr = JSON.parse(JSON.stringify(this.form.resideInfoDtos));
-            this.$refs["addForm"].resetFields();
-            this.form.resideInfoDtos = homeArr;
-          }
-        } else if (code >= 8000) {
-          this.$message.error(msg);
-        }
-      } catch (error) {
-        this.$message.error(msg);
-      }
-    },
-    showDialog({ index, value }, event) {
-      if (value == 1) {
-        value = "parymemberInfoDto";
-        this.form.baseInfoDto.categoryInfo.partyFlag = 1;
-      } else if (value == 0) {
-        this.form.baseInfoDto.categoryInfo.partyFlag = 0;
-      } else if (value == 2) {
-        this.form.baseInfoDto.categoryInfo.partyFlag = 2;
-      }
-      if (index != 3 && index) {
-        this.form.baseInfoDto.categoryInfo[value] = event ? 1 : 0;
-      } else if (index == 3) {
-        if (event) {
-          this.form.baseInfoDto.categoryInfo.specialCrowdFlag = 1;
-          if (value == "unitedFrontFlag" || value == "petitionOfficerFlag") {
-            this.form.baseInfoDto.categoryInfo[value] = 1;
-          }
-          this.form.specialDto.specialCategoryCodes.push(value);
-        } else {
-          this.form.specialDto.specialCategoryCodes =
-            this.form.specialDto.specialCategoryCodes.filter(
-              (item) => item != value
-            );
-          if (value == "unitedFrontFlag" || value == "petitionOfficerFlag") {
-            this.form.baseInfoDto.categoryInfo[value] = 0;
-          }
-        }
-      }
-      const map = {
-        parymemberInfoDto: {
-          formId: "parymemberInfoDto",
-          formType: "parymemberInfoDto",
-          title: "党员信息",
         },
-        disabilityFlag: {
-          formId: "healthDto",
-          formType: "healthDto",
-          title: "残疾信息",
+        getValiheList(index) {
+            console.log(this.form.resideInfoDtos[index].gridId, '小区接口');
+            console.log(this.form.resideInfoDtos);
+            const { user } = this.$store.state
+            this.$http.post('/actual/base/communityQuarters/listQuartersOptions', { gridId: this.form.resideInfoDtos[index].gridId, agencyId: user.agencyId }).then(({ data: res }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                } else {
+                    this.form.resideInfoDtos[index].optionsV = []
+                    this.form.resideInfoDtos[index].optionsV.push(...res.data)
+                }
+            }).catch((err) => {
+                console.log(err);
+                return this.$message.error('网络错误')
+            })
         },
-        seriousIllnessFlag: {
-          formId: "seriousIllnessDto",
-          formType: "seriousIllnessDto",
-          title: "大病信息",
+        getBuildList(index) {
+            this.$http.post('/actual/base/communityBuilding/buildingoption', { quartersId: this.form.resideInfoDtos[index].villageId }).then(({ data: res }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                } else {
+                    this.form.resideInfoDtos[index].optionsB = res.data
+                }
+            }).catch(() => {
+                return this.$message.error('网络错误')
+            })
         },
-        chronicDiseaseFlag: {
-          formId: "chronicDiseaseDto",
-          formType: "chronicDiseaseDto",
-          title: "慢病信息",
+        getUniList(index) {
+            this.$http.post('/actual/base/communityBuildingUnit/unitoption', { buildingId: this.form.resideInfoDtos[index].buildId }).then(({ data: res }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                } else {
+                    this.form.resideInfoDtos[index].optionsD = res.data
+                }
+            }).catch(() => {
+                return this.$message.error('网络错误')
+            })
         },
-        deathFlag: { formId: "deathDto", formType: "deathDto", title: "死亡" },
-        oldPeopleFlag: {
-          formId: "oldPeopleDto",
-          formType: "oldPeopleDto",
-          title: "老年人信息",
+        getHouseList(index) {
+            this.$http.post('/actual/base/communityHouse/houseoption', { unitId: this.form.resideInfoDtos[index].unitId }).then(({ data: res }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                } else {
+                    this.form.resideInfoDtos[index].optionsH = res.data
+                }
+            }).catch(() => {
+                return this.$message.error('网络错误')
+            })
         },
-        subsistenceAllowanceFlag: {
-          formId: "subsistenceAllowanceDto",
-          formType: "subsistenceAllowanceDto",
-          title: "低保人员信息",
+        handelClickAddHouse() {
+            this.form.resideInfoDtos.push(
+                {
+                    agencyName: this.$store.state.user.agencyName,
+                    agencyId: this.$store.state.user.agencyId,
+                    gridId: null,//所属网格id
+                    villageId: null,//小区id
+                    buildId: null,//楼栋id
+                    unitId: null,//单元id
+                    moveOutFlag: null,
+                    outOfTime: null,//迁出时间
+                    homeId: null, //房屋id
+                    placeOfDomicile: null,//户籍所在地	
+                    currentResidence: null,//现居住地
+                    householdSituation: null,//人户状况
+                    houseHolderRel: null,//与户主关系
+                    resiHouseRel: null,//人房关系
+                    optionsV: [],
+                    optionsB: [],
+                    optionsH: [],
+                    optionsD: [],
+                }
+            )
         },
-        veteranFlag: {
-          formId: "veteranDto",
-          formType: "veteranDto",
-          title: "退役军人信息",
+        handelClickDelHouse(i) {
+            this.form.resideInfoDtos = this.form.resideInfoDtos.filter((item, index) => index != i)
         },
-        ensureHouseFlag: {
-          formId: "ensureHouseDto",
-          formType: "ensureHouseDto",
-          title: "保障性住房信息",
+        handelCLickIdType(val){
+          if(val === 1){
+            this.getResidentInfoByIdNum()
+          }
         },
-        specialSupportFlag: {
-          formId: "specialSupportDto",
-          formType: "specialSupportDto",
-          title: "特扶人员",
+        handleValidBlur() {
+            if (this.form.baseInfoDto.idType == 1) {
+              this.getResidentInfoByIdNum()
+            }
+            if (!isCard(this.form.baseInfoDto.idNum) && !isPassport(this.form.baseInfoDto.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.baseInfoDto.idNum.length === 18 || this.form.baseInfoDto.idNum.length === 15) {
+                const _id = this.form.baseInfoDto.idNum.substr(0, 6)
+                const { sex, birth, age } = computedCard(this.form.baseInfoDto.idNum)
+                this.form.baseInfoDto.birthday = birth
+                this.form.baseInfoDto.gender = sex == 1 ? '1' : '2'
+                this.form.baseInfoDto.categoryInfo.oldPeopleFlag = age >= 60 ? 1 : 0
+                // this.form.IS_BDHJ = huji == _id ? '1' : ''
+                // 身份证前端验证角色方法 因原型没有注释
+                // this.validateIdcard(this.form.idNum)
+
+            }
+
         },
-        unitedFrontFlag: {
-          formId: "unitedFrontDto",
-          formType: "unitedFrontDto",
-          title: "统战人员",
+        async getResidentInfoByIdNum(){
+            try {
+                let url = '/actual/base/residentBaseInfo/getResidentInfoByIdNum'
+                let parm = {
+                    idType: this.form.baseInfoDto.idType,
+                    idNum: this.form.baseInfoDto.idNum
+                }
+                let { code, data, msg } = await requestGet(url,parm)
+                if (code == 0 && data != null) {
+                    this.$confirm(`该居民已存在于“${data.homeNames.join(',')}”是否继续填写`, {
+                    confirmButtonText: '前往修改',
+                    cancelButtonText: '继续填写',
+                    type: 'warning'
+                }).then(() => {
+                    this.$router.push({ name: 'edit-resi', query: { id: data.id }, params: { idNum: data.idNum, mobile: data.mobile } });
+
+                }).catch(() => {
+                    
+                });
+
+                } else if (code >= 8000) {
+                    this.$message.error(msg);
+                    this.btnLoading = false;
+                }
+            }
+            catch (error) {
+                // this.$message.error(msg);
+                console.log(msg);
+            }
+        },
+        handleLocalRadio(e) {
+            if (e.target.type === 'radio') return
+            this.form.baseInfoDto.localResidenceFlag = this.form.baseInfoDto.localResidenceFlag === 0 ? 1 : 0;
+            console.log(this.form.baseInfoDto.localResidenceFlag);
+        },
+        handelClickMarriage() {
+            this.form.familyInfoDto.spouseSituation = null
+        },
+        handelClickelderly() {
+            this.form.familyInfoDto.elderlyRelation = null
+            this.form.familyInfoDto.dependantMobile = null
+        },
+        handelClickCareerStatus(val) {
+            this.form.unemployedDto = {
+                originWorkUnit: null,//原工作单位
+                unemploymentTime: null,//失业时间yyyy-MM-dd	
+                unemploymentNum: null,//失业证号	
+                employmentNum: null,//再就业优惠证号	
+                specialSkill: null,//技术特长	
+                unempCompensationFlag: null,//是否领取失业补助金
+                unemploymentReason: null,//失业原因【字典表】code	
+                employmentHardFlag: null,//是否就业困难对象；1是0不是	
+                employmentWish: null,//劳动能力就业愿望
+
+            }
+            this.form.workInfoDto = {
+                careerStatus: val,//就业状况
+                workUnit: null,//工作单位
+                occupation: null,//职业
+            }
+            if (val == 0) {
+                this.form.baseInfoDto.categoryInfo.unemployedFlag = 1
+            }else{
+                this.form.baseInfoDto.categoryInfo.unemployedFlag = 0
+            }
+        },
+        handlerCancle() {
+            this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+                (item) => item.name !== 'add-resi'
+            );
+            let tab =
+                this.$store.state.contentTabs[
+                this.$store.state.contentTabs.length - 1
+                ];
+            this.$router.push({
+                name: tab.name,
+                params: { ...tab.params },
+                query: { ...tab.query },
+            });
         },
-        volunteerFlag: {
-          formId: "volunteerDto",
-          formType: "volunteerDto",
-          title: "志愿者",
+        handleClickSubmit(house) {
+            this.$refs['addForm'].validate((valid) => {
+                if (valid) {
+                    this.form.resideInfoDtos.forEach(item => {
+                        delete item.optionsV;
+                        delete item.optionsB;
+                        delete item.optionsH;
+                        delete item.optionsD;
+                    });
+                    this.submitForm(house);
+                }
+            })
+        },
+        async submitForm(house) {
+            this.btnLoading = true;
+            try {
+                let url = '/actual/base/residentBaseInfo/save'
+                let parm = {
+                    ...this.form
+                }
+                let { code, data, msg } = await requestPost(url, parm)
+                if (code == 0) {
+                    if (house != 'house') {
+                        this.$message.success('保存成功');
+                        this.$refs['addForm'].resetFields();
+                        this.handlerCancle();
+                    } else {
+                        this.$message.success('保存成功');
+                        let homeArr = JSON.parse(JSON.stringify(this.form.resideInfoDtos));
+                        this.$refs['addForm'].resetFields();
+                        this.form.resideInfoDtos = homeArr
+                    }
+                    this.btnLoading = false;
+
+                } else if (code >= 8000) {
+                    this.$message.error(msg);
+                    this.btnLoading = false;
+                }
+            }
+            catch (error) {
+                this.$message.error(msg);
+            }
         },
-      };
+        showDialog({ index, value }, event) {
+            if (value == 1) {
+                value = 'parymemberInfoDto'
+                this.form.baseInfoDto.categoryInfo.partyFlag = 1;
+            } else if (value == 0) {
+                this.form.baseInfoDto.categoryInfo.partyFlag = 0;
+            } else if (value == 2) {
+                this.form.baseInfoDto.categoryInfo.partyFlag = 2;
+            }
+            if (index != 3 && index) {
+                this.form.baseInfoDto.categoryInfo[value] = event ? 1 : 0;
+            } else if (index == 3) {
+                if (event) {
+                    this.form.baseInfoDto.categoryInfo.specialCrowdFlag = 1;
+                    if (value == 'unitedFrontFlag' || value == 'petitionOfficerFlag') {
+                        this.form.baseInfoDto.categoryInfo[value] = 1
+                    }
+                    this.form.specialDto.specialCategoryCodes.push(value);
+                } else {
+                    this.form.specialDto.specialCategoryCodes = this.form.specialDto.specialCategoryCodes.filter(item => item != value);
+                    if (value == 'unitedFrontFlag' || value == 'petitionOfficerFlag') {
+                        this.form.baseInfoDto.categoryInfo[value] = 0
+                    }
+                }
+            }
+            const map = {
+                'parymemberInfoDto': { formId: 'parymemberInfoDto', formType: 'parymemberInfoDto', title: '党员信息' },
+                'disabilityFlag': { formId: 'healthDto', formType: 'healthDto', title: '残疾信息' },
+                'seriousIllnessFlag': { formId: 'seriousIllnessDto', formType: 'seriousIllnessDto', title: '大病信息' },
+                'chronicDiseaseFlag': { formId: 'chronicDiseaseDto', formType: 'chronicDiseaseDto', title: '慢病信息' },
+                'deathFlag': { formId: 'deathDto', formType: 'deathDto', title: '死亡' },
+                'oldPeopleFlag': { formId: 'oldPeopleDto', formType: 'oldPeopleDto', title: '老年人信息' },
+                'subsistenceAllowanceFlag': { formId: 'subsistenceAllowanceDto', formType: 'subsistenceAllowanceDto', title: '低保人员信息' },
+                'veteranFlag': { formId: 'veteranDto', formType: 'veteranDto', title: '退役军人信息' },
+                'ensureHouseFlag': { formId: 'ensureHouseDto', formType: 'ensureHouseDto', title: '保障性住房信息' },
+                'specialSupportFlag': { formId: 'specialSupportDto', formType: 'specialSupportDto', title: '特扶人员' },
+                'unitedFrontFlag': { formId: 'unitedFrontDto', formType: 'unitedFrontDto', title: '统战人员' },
+                'volunteerFlag': { formId: 'volunteerDto', formType: 'volunteerDto', title: '志愿者' },
+            };
 
       if (map[value]) {
         this.dialogTitle = map[value].title;
diff --git a/src/views/modules/base/smartImport/cpts/createdTask.vue b/src/views/modules/base/smartImport/cpts/createdTask.vue
index 3afdd5cb6..da8cf094e 100644
--- a/src/views/modules/base/smartImport/cpts/createdTask.vue
+++ b/src/views/modules/base/smartImport/cpts/createdTask.vue
@@ -3,7 +3,12 @@
     <h3 class="title-small">基本信息</h3>
     <div class="content_box">
       <div class="left">
-        <el-form :model="form" :rules="rules" ref="importForm" label-width="100px">
+        <el-form
+          :model="form"
+          :rules="rules"
+          ref="importForm"
+          label-width="100px"
+        >
           <el-form-item label="任务类型" prop="importCategory">
             <el-select
               v-model="form.importCategory"
@@ -28,10 +33,13 @@
               <span v-if="categoryName">{{
                 this.$store.state.user.agencyName + categoryName || ""
               }}</span>
-              <span  v-if="categoryName">导入模板.xlsx</span>
+              <span v-if="categoryName">导入模板.xlsx</span>
               <span v-else>请先选择任务类型</span>
-              <el-button type="text" @click="handelClickDownModule"
-              v-if="categoryName">点击下载</el-button
+              <el-button
+                type="text"
+                @click="handelClickDownModule"
+                v-if="categoryName"
+                >点击下载</el-button
               ></span
             >
           </el-form-item>
@@ -40,6 +48,7 @@
               v-model="form.taskName"
               size="small"
               class="u-item-width-normal"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
         </el-form>
@@ -121,6 +130,9 @@
       width="75%"
     >
       <div v-if="dataList.length > 0" style="height: 600px; overflow-y: scroll">
+        <p style="margin-top: 0px;">
+          说明：系统将会将您上传的表格列自动匹配到平台对应的数据列，匹配错误或没有匹配上的列（红色高亮）您还可以手动匹配
+        </p>
         <el-table
           ref="ref_table"
           :data="dataList"
@@ -139,19 +151,33 @@
             prop="userTableHeader"
             header-align="center"
             align="center"
-            label="表格信息"
+            label="上传表格列"
             min-width="80"
           >
             <template slot-scope="scope">
-              {{ scope.row.userTableHeader || "--" }}
+              <span
+                :class="[
+                  scope.row.itemGroupId && scope.row.itemGroupId != ''
+                    ? ''
+                    : 'font_color_red',
+                ]"
+                >{{ scope.row.userTableHeader || "--" }}</span
+              >
             </template>
           </el-table-column>
-
+          <el-table-column
+            header-align="center"
+            align="center"
+            label="对应到"
+            min-width="50"
+          >
+            <template slot-scope="scope"><span v-if="scope.row.itemGroupId"> =></span> </template>
+          </el-table-column>
           <el-table-column
             prop="itemGroupId"
             header-align="center"
             align="center"
-            label="平台对应信息"
+            label="平台数据列"
             min-width="110"
           >
             <template slot-scope="scope">
@@ -229,7 +255,7 @@ export default {
       dataListLoading: false,
       dataList: [],
       groupList: [],
-      fileCode:null,
+      fileCode: null,
     };
   },
   props: {},
@@ -238,7 +264,7 @@ export default {
     await this.loadPersonGroup();
   },
   methods: {
-    handelClearCategory(){
+    handelClearCategory() {
       this.categoryName = null;
     },
     async loadPersonGroup() {
@@ -278,7 +304,6 @@ export default {
         this.$message.error(msg);
       }
     },
-    
 
     handelClickCategory(label) {
       this.categoryName = label;
@@ -340,7 +365,7 @@ export default {
       if (!this.form.importCategory || !this.form.taskName) {
         this.$message.error("请完善基本信息!");
         this.dataListLoading = false;
-        return false
+        return false;
       }
       return fileType && isLt1M;
     },
@@ -436,17 +461,17 @@ export default {
         });
     },
     handelClickUpload() {
-      this.$refs["importForm"].validate( (valid) => {
+      this.$refs["importForm"].validate((valid) => {
         if (valid) {
-           this.saveImportResiHouseExcel()
+          this.saveImportResiHouseExcel();
         }
       });
     },
-   async saveImportResiHouseExcel(){
+    async saveImportResiHouseExcel() {
       const { fileCode, dataList } = this;
-      if(!fileCode){
+      if (!fileCode) {
         this.$message.error("请先上传文件");
-        return
+        return;
       }
       let obj = dataList.reduce((acc, item) => {
         if (item.userTableHeader) {
@@ -459,12 +484,14 @@ export default {
       formData.append("fileCode", fileCode);
       formData.append("taskName", this.form.taskName);
       await this.$http
-        .post("/actual/base/intelligentImportData/importResiHouseExcel", formData)
+        .post(
+          "/actual/base/intelligentImportData/importResiHouseExcel",
+          formData
+        )
         .then((res) => {
           console.log("res-up", res);
           if (res.data.code == 0 && res.data.msg == "success") {
-
-            this.$emit("handelClickUpload",fileCode);
+            this.$emit("handelClickUpload", fileCode);
           } else this.$message.error(res.data.msg);
         })
         .catch((err) => {