diff --git a/src/router/index.js b/src/router/index.js
index 71e0f0f76..1bf64ca9e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -247,6 +247,26 @@ export const moduleRoutes = {
               isTab: true,
               title: "编辑重点人员",
             },
+          },
+          {
+            path: "add-elderly-database",
+            props: true,
+            name: "add-elderly-database",
+            component: () => import("@/views/modules/hengAnXin/elderlyDatabase/addElderlyDatabase.vue"),
+            meta: {
+              isTab: true,
+              title: "新增老年人",
+            },
+          },
+          {
+            path: "edit-elderly-database",
+            props: true,
+            name: "edit-elderly-database",
+            component: () => import("@/views/modules/hengAnXin/elderlyDatabase/editElderlyDatabase.vue"),
+            meta: {
+              isTab: true,
+              title: "编辑老年人",
+            },
           }
   ],
 };
diff --git a/src/views/modules/hengAnShield/keyPersonnel/addKeyPersonnel.vue b/src/views/modules/hengAnShield/keyPersonnel/addKeyPersonnel.vue
index 8006b8594..bef259653 100644
--- a/src/views/modules/hengAnShield/keyPersonnel/addKeyPersonnel.vue
+++ b/src/views/modules/hengAnShield/keyPersonnel/addKeyPersonnel.vue
@@ -1347,7 +1347,7 @@ export default {
         },
         handlerCancle() {
             this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
-                (item) => item.name !== 'add-resi'
+                (item) => item.name !== 'add-key-personnel'
             );
             let tab =
                 this.$store.state.contentTabs[
diff --git a/src/views/modules/hengAnShield/keyPersonnel/editKeyPersonnel.vue b/src/views/modules/hengAnShield/keyPersonnel/editKeyPersonnel.vue
index 53259fb81..f671882c3 100644
--- a/src/views/modules/hengAnShield/keyPersonnel/editKeyPersonnel.vue
+++ b/src/views/modules/hengAnShield/keyPersonnel/editKeyPersonnel.vue
@@ -1902,7 +1902,7 @@ export default {
     },
     handlerCancle() {
       this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
-        (item) => item.name !== "edit-resi"
+        (item) => item.name !== "edit-key-personnel"
       );
       let tab =
         this.$store.state.contentTabs[this.$store.state.contentTabs.length - 1];
diff --git a/src/views/modules/hengAnXin/elderlyDatabase/addElderlyDatabase.vue b/src/views/modules/hengAnXin/elderlyDatabase/addElderlyDatabase.vue
new file mode 100644
index 000000000..7e5f3b24d
--- /dev/null
+++ b/src/views/modules/hengAnXin/elderlyDatabase/addElderlyDatabase.vue
@@ -0,0 +1,1491 @@
+<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="flex_box">
+                            <el-form-item label="姓名" prop="baseInfoDto.name" class="font-color-orange flex_item_width1">
+                                <el-input class="list_item_width_1" v-model.trim="form.baseInfoDto.name" placeholder="请输入内容"
+                                    size="small" clearable></el-input>
+                            </el-form-item>
+                            <el-form-item label="证件类型" prop="baseInfoDto.idType" class="font-color-orange flex_item_width1">
+                                <el-select v-model.trim="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-form-item label="证件号" prop="baseInfoDto.idNum" class="font-color-orange flex_item_width1">
+                                <el-input v-model.trim="form.baseInfoDto.idNum" placeholder="请输入内容" clearable size="small"
+                                    class="list_item_width_1" @blur="handleValidBlur"></el-input>
+                            </el-form-item>
+                            <el-form-item label="国籍" prop="baseInfoDto.nationality" class="font-color-orange flex_item_width1">
+                                <el-select v-model.trim="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-form-item label="联系电话" prop="baseInfoDto.mobile" class="font-color-orange flex_item_width1">
+                                <el-input class="list_item_width_1" v-model.trim="form.baseInfoDto.mobile"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item>
+                            <el-form-item label="性别" class="flex_item_width1">
+                                <el-select v-model.trim="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-form-item label="出生日期" class="flex_item_width1">
+                                <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-form-item label="民族" class="flex_item_width1">
+                                <el-select v-model.trim="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-form-item label="文化程度" class="flex_item_width1">
+                                <el-select v-model.trim="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-form-item label="婚姻状况" class="flex_item_width1">
+                                <el-select v-model.trim="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-form-item label="配偶情况"  v-if="form.familyInfoDto.marriage == 'chuhun' || form.familyInfoDto.marriage == 'zaihun' || form.familyInfoDto.marriage == 'fuhun'" class="flex_item_width1">
+                                <el-select v-model.trim="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-form-item label="籍贯" class="flex_item_width1">
+                                <el-input v-model.trim="form.baseInfoDto.nativePlace" placeholder="请输入内容" clearable
+                                    size="small" class="list_item_width_1"></el-input>
+                                <el-radio v-model.trim="form.baseInfoDto.localResidenceFlag" style="margin-left: 10px;"
+                                    @click.native="handleLocalRadio($event)" :label="1">本地</el-radio>
+                            </el-form-item>
+                    <el-form-item label="备注" class="flex_item_width2" >
+                        <el-input type="textarea" class="item_width_1" :rows="3" placeholder="请输入内容"
+                            v-model.trim="form.baseInfoDto.remark" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+                <h5>居住信息登记</h5>
+                    <section v-for="(item, index) in this.form.resideInfoDtos" :key="index" >
+                               <div class="flex_box">
+                                <el-form-item label="所属组织" class="font-color-orange flex_item_width1"
+                                    :prop="`resideInfoDtos[${index}].gridId`" :rules="[
+                                    { required: true, message: '请选择所属组织', trigger: 'blur' },
+                                ]">
+                                    <el-cascader class="list_item_width_1" ref="myCascader" clearable size="small"
+                                        v-model.trim="form.resideInfoDtos[index].gridId" :options="orgOptions"
+                                        :props="orgOptionProps" @change="handleChangeAgency(index)"></el-cascader>
+                                </el-form-item>
+                                <el-form-item :prop="`resideInfoDtos[${index}].villageId`" label="所属房屋"
+                                    label-width="100px" class="font-color-orange flex_item_width4" :rules="[
+                                    { required: true, message: '请选择小区', trigger: 'blur' },
+                                ]">
+                                    <el-select v-model.trim="form.resideInfoDtos[index].villageId" placeholder="请选择小区"
+                                        size="small" class="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' },
+                                ]" class="flex_item_width3">
+                                    <el-select v-model.trim="form.resideInfoDtos[index].buildId" placeholder="楼号"
+                                        size="small" clearable @change="handleChangeB(index)"
+                                        class=" 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' },
+                                ]"  class="flex_item_width3">
+                                    <el-select v-model.trim="form.resideInfoDtos[index].unitId" placeholder="单元"
+                                        size="small" clearable class=" 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' },
+                                ]"  class="flex_item_width3">
+                                    <el-select v-model.trim="form.resideInfoDtos[index].homeId" placeholder="房号"
+                                        size="small" clearable class=" 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>
+                               </div>
+                               <div  class="flex_box">
+                                <el-form-item label="人房关系" class="font-color-blue flex_item_width1">
+                                    <el-select v-model.trim="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-form-item label="人户状况" class="font-color-blue flex_item_width1">
+                                    <el-select v-model.trim="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-form-item class="flex_item_width1" label="户籍所在地" v-if="form.resideInfoDtos[index].householdSituation == 'rzhbz'">
+                                    <el-input 
+                                        v-model.trim="form.resideInfoDtos[index].placeOfDomicile" placeholder="请输入内容"
+                                        size="small" clearable></el-input>
+                                </el-form-item>
+                                <el-form-item class="flex_item_width1" label="现居住地址" v-else-if="form.resideInfoDtos[index].householdSituation == 'hzrbz'">
+                                    <el-input 
+                                        v-model.trim="form.resideInfoDtos[index].currentResidence" placeholder="请输入内容"
+                                        size="small" clearable></el-input>
+                                </el-form-item>
+                                <el-form-item class="flex_item_width1" label="迁出时间" v-else-if="form.resideInfoDtos[index].householdSituation == 'rhdbz'">
+                                    <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-form-item class="flex_item_width1 font-color-blue font-color-blue2" label="与户主关系" >
+                                    <el-select v-model.trim="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>
+                               </div>
+                    </section>
+                <h5>拓展信息登记</h5>
+                <div class="flex_box">
+                            <el-form-item label="宗教信仰" class="flex_item_width1">
+                                <el-input class="list_item_width_1" v-model.trim="form.religionDto.religion"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item>
+                            <el-form-item label="就业状态" class="font-color-blue flex_item_width1">
+                                <el-select v-model.trim="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-form-item label="工作单位" class="flex_item_width1"   v-if="form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
+                                <el-input class="list_item_width_1" v-model.trim="form.workInfoDto.workUnit"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item>
+                            <el-form-item label="职业" class="flex_item_width1" v-if="form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
+                                <el-input class="list_item_width_1" v-model.trim="form.workInfoDto.occupation"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item>
+                            <!-- <el-form-item label="原工作单位" class="flex_item_width1"  v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                                <el-input class="list_item_width_1" v-model.trim="form.unemployedDto.originWorkUnit"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item> -->
+                            <!-- <el-form-item label="失业时间" class="flex_item_width1"  v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                                <el-date-picker v-model.trim="form.unemployedDto.unemploymentTime"
+                                    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-form-item label="月收入" class="flex_item_width1" v-if="form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
+                                <el-input class="list_item_width_1" v-model.trim="form.economyDto.monthIncome"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item>
+                            <!-- <el-form-item label="失业证号" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus" :rules="[
+                                    { required: true, message: '请填写失业证号', trigger: 'blur' },
+                                ]" prop="unemployedDto.unemploymentNum">
+                                <el-input class="list_item_width_1" v-model.trim="form.unemployedDto.unemploymentNum"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item> -->
+                            <!-- <el-form-item label="失业原因" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                                <el-select v-model.trim="form.unemployedDto.unemploymentReason" placeholder="请选择"
+                                    size="small" class="list_item_width_1" clearable>
+                                    <el-option v-for="(item, index) in dicts.unemploymentReasonList" :key="index"
+                                        :label="item.label" :value="item.value"></el-option>
+                                </el-select>
+                            </el-form-item> -->
+                            <!-- <el-form-item label="再就业优惠证号" class="flex_item_width1"  v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                                <el-input class="list_item_width_1" v-model.trim="form.unemployedDto.employmentNum"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item> -->
+                            <!-- <el-form-item label="技术特长"class="flex_item_width1"  v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                                <el-input class="list_item_width_1" v-model.trim="form.unemployedDto.specialSkill"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item> -->
+                            <!-- <el-form-item label="是否领取失业金" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                                <el-radio-group v-model.trim="form.unemployedDto.unempCompensationFlag">
+                                    <el-radio :label="item.value" v-for="item in disabilityFlagList" :key="item.value">{{
+                item.label
+            }}</el-radio>
+                                </el-radio-group>
+                            </el-form-item> -->
+                            <!-- <el-form-item label="是否就业困难对象" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                                <el-radio-group v-model.trim="form.unemployedDto.employmentHardFlag">
+                                    <el-radio :label="item.value" v-for="item in disabilityFlagList" :key="item.value">{{
+                item.label
+            }}</el-radio>
+                                </el-radio-group>
+                            </el-form-item> -->
+                            <!-- <el-form-item label="劳动就业愿望" class="flex_item_width1"  v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus"  :rules="[
+                                    { required: true, message: '请选择劳动就业愿望', trigger: 'blur' },
+                                ]" prop="workInfoDto.employmentWish">
+                                <el-select v-model.trim="form.workInfoDto.employmentWish" placeholder="请选择" size="small"
+                                    class="list_item_width_1" clearable>
+                                    <el-option v-for="(item, index) in dicts.employmentWishList" :key="index"
+                                        :label="item.label" :value="item.value"></el-option>
+                                </el-select>
+                            </el-form-item> -->
+                            <el-form-item label="有无赡养人" class="flex_item_width1">
+                                <el-radio-group v-model.trim="form.familyInfoDto.elderlyFlag">
+                                    <el-radio :label="item.value" v-for="item in hasOptions" :key="item.value"
+                                        @click.native="handelClickelderly">{{ item.label
+                                        }}</el-radio>
+                                </el-radio-group>
+                            </el-form-item>
+                            <el-form-item label="与赡养人关系" class="flex_item_width1" v-if="form.familyInfoDto.elderlyFlag == 1">
+                                <el-select v-model.trim="form.familyInfoDto.elderlyRelation" 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-form-item label="赡养人联系电话" class="flex_item_width1"v-if="form.familyInfoDto.elderlyFlag == 1">
+                                <el-input class="list_item_width_1" v-model.trim="form.familyInfoDto.dependantMobile"
+                                    placeholder="请输入内容" size="small" clearable></el-input>
+                            </el-form-item>
+                </div>
+                <h5>人员标签</h5>
+                <div class="stafftag">
+                    <stafftag :formType="'add'" ref="stafftag" @showDialog="showDialog"></stafftag>
+                </div>
+            </el-form>
+            <el-row style="margin:24px">
+                <el-col :span="24" align="center">
+                    <el-button size="small" class="diy-button--white" @click="handlerCancle" plain>取消</el-button>
+                    <el-button type="primary" size="small" :loading="btnLoading"
+                        @click="handleClickSubmit">保存</el-button>
+                    <el-button type="primary" size="small" :loading="btnLoading"
+                        @click="handleClickSubmit('house')">提交并补充老年人员信息</el-button>
+                </el-col>
+            </el-row>
+        </div>
+        <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" destroy-on-close width="1028px">
+            <resi-expand ref="resiExpand" @submitExpand="submitExpand" @hideExpand="hideExpand"
+                :operationType="'add'"></resi-expand>
+        </el-dialog>
+        <el-dialog title="密码验证" :visible.sync="showCheckPassword">
+        <el-form :model="checkPasswordFrom" :rules="checkPasswordRulse" ref="checkPasswordFrom">
+            <el-form-item label="密码" prop="password">
+            <el-input v-model.trim="checkPasswordFrom.password" autocomplete="off" type="password" placeholder="请输入当前账号密码"
+                @keydown.native.enter="handelClickCheckPassword"></el-input>
+            </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+            <el-button @click="showCheckPassword = false">取 消</el-button>
+            <el-button type="primary" @click="handelClickCheckPassword">确 定</el-button>
+        </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import { requestGet, requestPost } from "@/js/dai/request";
+import {
+  isCard,
+  isPassport,
+  isMobile,
+  isPhone,
+  isHKPassport,
+  isTwPassport,
+  isSoldier,
+} from "@/utils/validate";
+import { computedCard } from "@/utils/index";
+import {
+  idTypeList,
+  genderList,
+  hasOptions,
+  disabilityFlagList,
+} from "@/js/columns/constants";
+import stafftag from "@/views/modules/portrayal/jumin/cpts/staffTag.vue";
+import resiExpand from "@/views/components/resiExpand/index.vue";
+import nextTick from "dai-js/tools/nextTick";
+export default {
+  name: "addKeyPersonnel",
+  data() {
+    return {
+    resiId:null,
+    showCheckPassword:false,
+    checkPasswordFrom: {
+        password: "",
+    },
+    checkPasswordRulse: {
+        password: [
+          { required: true, message: "请输入密码", trigger: "blur" },
+          {
+            min: 6,
+            max: 18,
+            message: "长度在 6 到 18 个字符",
+            trigger: "blur",
+          },
+        ],
+    },
+    dialogVisible: false,
+    dialogTitle: "",
+    formList: [],
+    orgOptions: [],
+    orgOptionProps: {
+        value: 'agencyId',
+        label: 'agencyName',
+        children: 'subAgencyList',
+        emitPath: false,
+        multiple: false,
+        checkStrictly: true
+    },
+    form: {
+                baseInfoDto: {
+                    name: null,//姓名
+                    idType: null,//证件类型
+                    idNum: null,//身份证号
+                    nationality: null,//国籍
+                    mobile: null,//手机号
+                    gender: null,//性别
+                    birthday: null,//出生日期
+                    nation: null,//民族
+                    localResidenceFlag: 0,//是否本地户籍
+                    nativePlace: null,//籍贯,
+                    remark: null,//备注
+                    categoryInfo: {
+                        partyFlag: 0,
+                        subsistenceAllowanceFlag: 0,
+                        ensureHouseFlag: 0,
+                        unemployedFlag: 0,
+                        fertileWomanFlag: 0,
+                        veteranFlag: 0,
+                        unitedFrontFlag: 0,
+                        petitionOfficerFlag: 0,
+                        volunteerFlag: 0,
+                        oldPeopleFlag: 0,
+                        emptyNesterFlag: 0,
+                        specialSupportFlag: 0,
+                        disabledFlag: 0,
+                        dementedFlag: 0,
+                        disabilityFlag: 0,
+                        seriousIllnessFlag: 0,
+                        chronicDiseaseFlag: 0,
+                        specialCrowdFlag: 0,
+                        tenantFlag: 0,
+                        floatingFlag: 0,
+                        liveAloneFlag: 0,
+                        publicWelfareFlag: 0,
+                        buildingChiefFlag: 0,
+                        unitChiefFlag: 0,
+                        riskyFlag: 0,
+                        delFlag: 0,
+                        aidsFlag:0,
+                        lbcFlag:0,
+                        negFlag :0
+                    }
+                },
+                eduInfoDto: {
+                    cultureLevel: null,//文化程度
+                },
+                familyInfoDto: {
+                    marriage: null,//婚姻状况
+                    spouseSituation: null,//配偶情况
+                    elderlyFlag: null,//有无赡养人
+                    elderlyRelation: null,//与赡养人关系
+                    dependantMobile: null,//赡养人联系电话	
+                },
+                resideInfoDtos: [
+                    {
+                        agencyName: this.$store.state.user.agencyName,
+                        agencyId: this.$store.state.user.agencyId,
+                        gridId: this.$route.params.gridId,//所属网格id
+                        villageId: this.$route.params.villageId,//小区id
+                        buildId: this.$route.params.buildId,//楼栋id
+                        unitId: this.$route.params.unitId,//单元id
+                        moveOutFlag: null,
+                        outOfTime: null,//迁出时间
+                        homeId: this.$route.params.homeId, //房屋id
+                        placeOfDomicile: null,//户籍所在地	
+                        currentResidence: null,//现居住地
+                        householdSituation: null,//人户状况
+                        houseHolderRel: null,//与户主关系
+                        resiHouseRel: null,//人房关系
+                        optionsV: [],
+                        optionsB: [],
+                        optionsH: [],
+                        optionsD: [],
+                    }
+                ],
+                religionDto: {
+                    religion: null,//宗教信仰
+                },
+                workInfoDto: {
+                    careerStatus: null,//就业状况
+                    workUnit: null,//工作单位
+                    occupation: null,//职业
+                },
+                specialDto: {
+                    specialCategoryCodes: []
+                },
+                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,//劳动能力就业愿望	 
+                },
+                economyDto: {
+                    monthIncome: null,//月收入
+                },
+                oldPeopleDto:{
+                    oldPeopleCategories:[],
+                    resideSituation: null,
+                    oldSubsidy:null
+                }
+    },
+    footerInputList: [
+                {
+                    id: 'healthDto',
+                    children: [
+                        {
+                            label: "残疾类别",
+                            itemType: "select1",
+                            formName: "disabilityCategoryCode",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            check:'fourFont',
+                            opctionParams: { dictType: 'disability_category_code' },
+                            opction: []
+                        },
+                        {
+                            label: "残疾等级",
+                            check:'fourFont',
+                            itemType: "select1",
+                            formName: "disabilityLevel",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'disability_level' },
+                            opction: []
+                        },
+                        {
+                            label: "残疾证号",
+                            check:'fourFont',
+                            itemType: "input1",
+                            formName: "disabilityNum",
+                        },
+                        {
+                            label: "残疾说明",
+                            itemType: "input1",
+                            formName: "disabilityDesc",
+                        },
+                        {
+                            label: "监护人",
+                            itemType: "radio1",
+                            formName: "guardianFlag",
+                            opction: [
+                                { label: '有', formName: '', value: 1 },
+                                { label: '无', formName: '', value: 0 }
+                            ]
+                        },
+                        {
+                            label: "监护人姓名",
+                            itemType: "input1",
+                            formName: "guardianName",
+                        },
+                        {
+                            label: "监护人联系电话",
+                            itemType: "input1",
+                            formName: "guardianMobile",
+                        },
+                        {
+                            label: "技能特长",
+                            itemType: "radio1",
+                            formName: "specialSkillFlag",
+                            opction: [
+                                { label: '有', formName: '', value: 1 },
+                                { label: '无', formName: '', value: 0 }
+                            ]
+                        },
+                        {
+                            label: "劳动能力",
+                            itemType: "radio1",
+                            formName: "workCapacityFlag",
+                            opction: [
+                                { label: '有', formName: '', value: 1 },
+                                { label: '无', formName: '', value: 0 }
+                            ]
+                        },
+                    ]
+                },
+                {
+                    id: 'seriousIllnessDto',
+                    children: [
+                        {
+                            label: "所患大病",
+                            itemType: "checkbox",
+                            formName: "illnessCodes",
+                            check:'fourFont',
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'illness_code' },
+                            opction: []
+                        },]
+                },
+                {
+                    id: 'chronicDiseaseDto',
+                    children: [
+                        {
+                            label: "所患慢病",
+                            check:'fourFont',
+                            itemType: "checkbox",
+                            formName: "chronicDiseaseCodes",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'chronic_disease_code' },
+                            opction: []
+                        },
+                    ]
+                },
+                {
+                    id: 'baseInfoDto',
+                    children: [
+                        {
+                            label: "死亡时间",
+                            itemType: "datepicker1",
+                            formName: "deathDate",
+                            check:'fourFont'
+                        },
+                    ]
+                },
+                {
+                    id: 'oldPeopleDto',
+                    children: [
+                        {
+                            label: "老年人分类",
+                            itemType: "checkbox",
+                            check:'fiveFont',
+                            formName: "oldPeopleCategories",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'oldPeople_categories' },
+                            opction:[]
+                        },
+                        {
+                            label: "居住情况",
+                            itemType: "select1",
+                            check:'fourFont',
+                            formName: "resideSituation",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'reside_situation' },
+                            opction:[]
+                        },
+                        {
+                            label: "高龄补助",
+                            // check:'fourFont',
+                            itemType: "inputNum",
+                            formName: "oldSubsidy",
+                        },
+                    ]
+                },
+                {
+                    id: 'subsistenceAllowanceDto',
+                    children: [
+                        {
+                            label: "低保类别",
+                            itemType: "select1",
+                            check:'fourFont',
+                            formName: "category",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'subsistence_allowance_category' },
+                            opction:[]
+                        },
+                        {
+                            label: "低保享受原因",
+                            itemType: "checkbox",
+                            check:'sixFont',
+                            formName: "reasons",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'subsistence_allowance_reasons' },
+                            opction: []
+                        },
+                    ]
+                },
+                {
+                    id: "parymemberInfoDto",
+                    children: [
+                        {
+                            label: "入党时间",
+                            itemType: "datepicker1",
+                            formName: "joinTime",
+                            check:'fourFont',
+                            opction: [
+                            ]
+                        },
+                        {
+                            label: "转正时间",
+                            itemType: "datepicker1",
+                            formName: "positiveTime",
+                            opction: [
+                            ]
+                        },
+                        {
+                            label: "所属党组织",
+                            itemType: "cascader1",
+                            check:'fiveFont',
+                            formName: "partyOrgId",
+                            opction: [
+                            ]
+                        },
+                        {
+                            label: "流动党员",
+                            itemType: "radio1",
+                            formName: "flowFlag",
+                            opction: [
+                                { label: '是', value: 1 },
+                                { label: '否', value: 0 },
+                            ]
+                        },
+                        {
+                            label: "流动党员活动证号",
+                            itemType: "input1",
+                            formName: "flowActNum",
+                        },
+                        {
+                            label: "党组织职务",
+                            itemType: "select1",
+                            check:'fiveFont',
+                            formName: "partyJob",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'party_job' },
+                            opction: [
+                            ]
+                        },
+                        {
+                            label: "工作职责",
+                            itemType: "input1",
+                            formName: "duty",
+                        },
+                        {
+                            label: "是否退休",
+                            itemType: "radio1",
+                            formName: "retiredFlag",
+                            opction: [
+                                { label: '是', value: 1 },
+                                { label: '否', value: 0 },
+                            ]
+                        }, {
+                            label: "党员中心户",
+                            itemType: "radio1",
+                            formName: "centerFlag",
+                            check:'fiveFont',
+                            opction: [
+                                { label: '是', value: 1 },
+                                { label: '否', value: 0 },
+                            ]
+                        }, {
+                            label: "免学习",
+                            itemType: "radio1",
+                            formName: "studyNotNeed",
+                            opction: [
+                                { label: '是', value: 1 },
+                                { label: '否', value: 0 },
+                            ]
+                        }, {
+                            label: "入党时所在党支部",
+                            itemType: "input1",
+                            formName: "joinBranchName",
+                        }, {
+                            label: "组织关系转入社区时间",
+                            itemType: "datepicker1",
+                            formName: "joinCommunityTime",
+                            opction: [
+                            ]
+                        },
+                    ]
+                },
+                {
+                    id: 'ensureHouseDto',
+                    children: [
+                        {
+                            label: "所在社区",
+                            check:'fourFont',
+                            itemType: "input1",
+                            formName: "liveCommunity",
+                        },
+                        {
+                            label: "住房性质",
+                            check:'fourFont',
+                            itemType: "select1",
+                            formName: "housingNature",
+                            opctionUrl: 'sys/dict/data/house',
+                            opctionParams: { formCode: "resi_base_info" },
+                            opction: [
+                            ]
+                        }
+                    ]
+                },
+                {
+                    id: 'veteranDto',
+                    children: [
+                        {
+                            label: "入伍日期",
+                            itemType: "datepicker1",
+                            formName: "joinArmyTime",
+                            check:'fourFont',
+                            opction: [
+                            ]
+                        },
+                        {
+                            label: "退伍日期",
+                            check:'fourFont',
+                            itemType: "datepicker1",
+                            formName: "leaveArmyTime",
+                            opction: [
+                            ]
+                        },
+                        {
+                            label: "服役单位",
+                            itemType: "input1",
+                            formName: "serviceUnit",
+                        },
+                        {
+                            label: "接收单位",
+                            itemType: "input1",
+                            formName: "receiveUnit",
+                        },
+                        {
+                            label: "待安置补助金",
+                            itemType: "inputNum",
+                            formName: "settlementAmount",
+                            opction: [
+                            ]
+                        },
+                        {
+                            label: "培训状况",
+                            itemType: "input1",
+                            formName: "trainDesc",
+                        },
+                        {
+                            label: "现就业情况",
+                            itemType: "input1",
+                            formName: "employmentSituation",
+                        },
+                        {
+                            label: "是否办理公益性岗位",
+                            itemType: "radio1",
+                            check:'nineFont',
+                            formName: "pubWelfareJobFlag",
+                            opction: [
+                                { label: '是', value: 1 },
+                                { label: '否', value: 0 },
+                            ]
+                        }
+                    ]
+                },
+                {
+                    id: 'unitedFrontDto',
+                    children: [{
+                        label: "统战类型",
+                        check:'fourFont',
+                        itemType: "input1",
+                        formName: "unitedFrontType",
+                    }]
+                },
+                {
+                    id: 'volunteerDto',
+                    children: [
+                        {
+                            label: "志愿者类别",
+                            itemType: "checkbox",
+                            formName: "volunteerCategory",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: "VOLUNTEER_CATEGORY" },
+                            opction: [
+                            ]
+                        }
+                    ]
+                },
+                {
+                    id: 'specialSupportDto',
+                    children: [
+                        {//0
+                            label: "特扶类别",
+                            check:'fourFont',
+                            itemType: "select1",
+                            formName: "specialSupportType",
+                            opction: [
+                                {
+                                    value: '1',
+                                    label: '失独'
+                                },
+                                {
+                                    value: '2',
+                                    label: '伤残'
+                                }
+                            ]
+                        },
+                        {//1
+                            label: "子女姓名",
+                            // check:'fourFont',
+                            itemType: "input1",
+                            formName: "childName",
+                            opction: []
+                        },
+                        {//2
+                            label: "子女性别",
+                            // check:'fourFont',
+                            itemType: "select1",
+                            formName: "childGender",
+                            opction: [
+                                {
+                                    value: '1',
+                                    label: '男'
+                                },
+                                {
+                                    value: '2',
+                                    label: '女'
+                                }
+                            ]
+                        },
+                        {
+                            label: "子女死亡日期",
+                            // check:'sixFont',
+                            itemType: "datepicker1",
+                            formName: "certificateDate",
+                            opction: [],
+                        },
+                        {
+                            label: "子女伤残类别",
+                            check:'sixFont',
+                            itemType: "select1",
+                            formName: "childDisabilityCategoryCode",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'disability_category_code' },
+                            opction: []
+                        },
+                        {
+                            label: "子女伤残等级",
+                            // check:'sixFont',
+                            itemType: "select1",
+                            formName: "childDisabilityLevel",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'disability_level' },
+                            opction: []
+                        }
+                    ]
+                },
+                {
+                   id:'unemployedDto',
+                   children:[
+                        {
+                            label: "原工作单位",
+                            itemType: "input1",
+                            formName: "originWorkUnit",
+                            opction: []
+                        },
+                        {
+                            label: "失业时间",
+                            itemType: "datepicker1",
+                            formName: "unemploymentTime",
+                            opction: []
+                        }, 
+                        {
+                            label: "失业证号",
+                            itemType: "input1",
+                            formName: "unemploymentNum",
+                            opction: []
+                        },
+                        {
+                            label: "失业原因",
+                            itemType: "select1",
+                            formName: "unemploymentReason",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'unemployment_reason' },
+                            opction: []
+                        },
+                        {
+                            label: "再就业优惠证号",
+                            itemType: "input1",
+                            formName: "employmentNum",
+                            opction: []
+                        },
+                        {
+                            label: "技术特长",
+                            itemType: "input1",
+                            formName: "specialSkill",
+                            opction: []
+                        },
+                        {
+                            label: "是否领取失业金",
+                            itemType: "radio1",
+                            formName: "unempCompensationFlag",
+                            opction: [
+                                { label: '是', value: 1 },
+                                { label: '否', value: 0 },
+                            ]
+                        },
+                        {
+                            label: "是否就业困难对象",
+                            itemType: "radio1",
+                            formName: "employmentHardFlag",
+                            opction: [
+                                { label: '是', value: 1 },
+                                { label: '否', value: 0 },
+                            ]
+                        },
+                        {
+                            label: "劳动就业愿望",
+                            itemType: "select1",
+                            formName: "employmentWish",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'career_goals' },
+                            opction: []
+                        }
+                   ]
+                }
+    ],
+    idTypeList,
+    genderList,
+    hasOptions,
+    disabilityFlagList,
+    btnLoading: false,
+    rules: {
+        "baseInfoDto.name": [
+          { required: true, message: "请输入姓名", trigger: "blur" },
+        ],
+        "baseInfoDto.idType": [
+          { required: true, message: "请选择证件类型", trigger: "blur" },
+        ],
+        "baseInfoDto.idNum": [
+          { required: true, message: "请输入证件号码", trigger: "blur" },
+        ],
+        "baseInfoDto.mobile": [
+          { required: true, message: "请输入电话", trigger: "blur" },
+        ],
+        "baseInfoDto.nationality": [
+          { required: true, message: "请选择国籍", trigger: "blur" },
+        ],
+    },
+    dicts: {
+        educationList: [], //文化程度
+        nationList: [], //民族
+        nationalityList: [], //国籍
+        marriageList: [], //婚姻状况
+        householdSituationList: [], //人户状况
+        houseHolderRelList: [], //与户主关系
+        careerStatusList: [], //就业状况
+        spouseSituationList: [], //配偶情况
+        unemploymentReasonList: [], //失业原因
+        resiHouseRelList: [
+          {
+            label: "自住",
+            value: 0,
+          },
+          {
+            label: "租住",
+            value: 1,
+          },
+        ],
+    },
+    logLevelChecked: 0,
+    };
+  },
+  created() {
+    this.getDicts();
+    this.getOrgTreeList();
+    this.initHouseBind();
+  },
+  methods: {
+    handelClickCheckPassword() {
+      this.$refs.checkPasswordFrom.validate((vali) => {
+        if (vali) {
+          this.saveCheckPassword(this.checkPasswordFrom.password);
+        } else {
+          return false;
+        }
+      });
+    },
+    async saveCheckPassword(password){
+      const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.resiId}`;
+          let parm = {
+            password,
+          };
+          const { data, code, msg } = await requestPost(url, parm);
+          if (code === 0) {
+            this.showCheckPassword = false;
+            this.$router.push({
+              name: "edit-resi",
+              query: { id: this.resiId },
+              params: { idNum: data.idNum, mobile: data.mobile, name: data.name, nationality: data.nationality },
+            });
+            this.checkPasswordFrom.password = "";
+          } else {
+            this.$message.error(msg);
+          }
+    },
+    // 从房屋画像进行添加居民时绑定房屋信息
+    initHouseBind() {
+      for (let i in this.form.resideInfoDtos) {
+        this.getValiheList(i);
+        this.getBuildList(i);
+        this.getHouseList(i);
+        this.getUniList(i);
+        this.form.resideInfoDtos[i].orgOptions = [];
+        this.getOrgTreeList(this.form.resideInfoDtos[i].agencyId, i);
+      }
+    },
+    async getDicts() {
+      try {
+        const requests = [
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "nationality",
+          }),
+          this.$http.post("sys/dict/data/nation", {
+            formCode: "resi_base_info",
+          }),
+          this.$http.post("sys/dict/data/education", {
+            formCode: "resi_base_info",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "marriage",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "household_situation",
+          }),
+          this.$http.post("sys/dict/data/relationship", {
+            formCode: "resi_base_info",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "career_status",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "spouse_situation",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "unemployment_reason",
+          }),
+        ];
+        const dictKeys = [
+          "nationalityList",
+          "nationList",
+          "educationList",
+          "marriageList",
+          "householdSituationList",
+          "houseHolderRelList",
+          "careerStatusList",
+          "spouseSituationList",
+          "unemploymentReasonList",
+        ]; // 对应的键名
+        const results = await Promise.all(requests);
+        results.forEach((result, index) => {
+          if (result.data.code === 0) {
+            this.dicts[dictKeys[index]].push(...result.data.data);
+          } else {
+            console.log(`获取${dictKeys[index]}失败: ${result.data.msg}`);
+          }
+        });
+      } catch (error) {
+        console.log("获取字典失败: ", error);
+      }
+    },
+    getOrgTreeList() {
+      this.$http
+        .post("/gov/org/customeragency/agencygridtree", {})
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.orgOptions = [];
+            this.orgOptions.push(res.data);
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    handelChangeResiHouseRel(val, index) {
+      this.form.resideInfoDtos[index].householdSituation =
+        val == 0 ? "rhyz" : "rzhbz";
+    },
+    handleChangeV(index) {
+      this.form.resideInfoDtos[index].buildId = "";
+      this.form.resideInfoDtos[index].unitId = "";
+      this.form.resideInfoDtos[index].homeId = "";
+      this.getBuildList(index);
+      this.getUniList(index);
+      this.getHouseList(index);
+    },
+    handleChangeB(index) {
+      this.form.resideInfoDtos[index].unitId = "";
+      this.form.resideInfoDtos[index].homeId = "";
+      this.getUniList(index);
+      this.getHouseList(index);
+    },
+    handleChangeD(index) {
+      this.form.resideInfoDtos[index].homeId = "";
+      this.getHouseList(index);
+    },
+    handleChangeH(i) {},
+    handleChangeAgency(index) {
+      let obj = this.$refs[`myCascader`][index].getCheckedNodes()[0]
+        ? this.$refs["myCascader"][index].getCheckedNodes()[0].data
+        : null;
+      if (obj) {
+        if (obj.level === "grid") {
+          this.form.resideInfoDtos[index].gridId = obj.agencyId;
+          this.form.resideInfoDtos[index].agencyId = obj.pid;
+          this.form.resideInfoDtos[index].villageId = "";
+          this.form.resideInfoDtos[index].buildId = "";
+          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) {
+            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)
+        },
+        handelCLickIdType(val){
+          if(val === 1){
+            this.getResidentInfoByIdNum()
+          }
+        },
+        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;
+                let obj = {oldPeopleFlag:age >= 60 ? 1 : 0,fertileWomanFlag:this.form.baseInfoDto.gender == 2 && (age >= 18 && age < 49)? 1 : 0,sex,age}
+                this.form.baseInfoDto.categoryInfo.fertileWomanFlag = this.form.baseInfoDto.gender == 2 && (age >= 18 && age < 49)? 1 : 0;
+                this.$refs['stafftag'].updatedForm(obj);
+                this.form.oldPeopleDto.oldPeopleCategories = ['oldPeopleFlag'];
+                // this.form.IS_BDHJ = huji == _id ? '1' : ''
+                // 身份证前端验证角色方法 因原型没有注释
+                // this.validateIdcard(this.form.idNum)
+            }
+        },
+        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.resiId = data.id
+                    this.showCheckPassword = true;
+                }).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;
+        },
+        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,//职业
+            }
+        },
+        handlerCancle() {
+            this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+                (item) => item.name !== 'add-elderly-database'
+            );
+            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) {
+            console.log('this.form===', this.form)
+            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) {
+                if(value === 'deathFlag'){
+                  this.form.baseInfoDto.deathFlag = event?1:0
+                }else{
+                  this.form.baseInfoDto.categoryInfo[value] = event ? 1 : 0;
+                }
+                if(value === 'oldPeopleFlag'){
+                    this.$nextTick(()=>{
+                        this.$refs['resiExpand'].form.oldPeopleDto.oldPeopleCategories = ['oldPeopleFlag'];
+                    })
+                }
+                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: 'baseInfoDto', formType: 'baseInfoDto', 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: '志愿者' },
+                'unemployedFlag': { formId: 'unemployedDto', formType: 'unemployedDto', title: '失业人员' }
+            };
+      if (map[value]) {
+        this.dialogTitle = map[value].title;
+        this.dialogVisible =
+          (event == true || value == "parymemberInfoDto") &&
+          this.dialogTitle != "";
+        this.$nextTick(() => {
+          this.$refs["resiExpand"].formList = [
+            this.footerInputList.find((item) => item.id === map[value].formId),
+          ];
+          this.$refs["resiExpand"].formType = map[value].formType;
+          this.$refs["resiExpand"].showForm();
+        });
+      }
+    },
+    // 提交扩展信息
+    submitExpand(form, formType) {
+      this.form[formType] = form[formType];
+      this.dialogVisible = false;
+    },
+    hideExpand(formType) {
+        if(formType!= 'baseInfoDto'){
+        delete this.form[formType];
+      }else{
+        this.form['baseInfoDto'].deathFlag = 0;
+      }
+      this.dialogVisible = false;
+    },
+  },
+  components: { stafftag, resiExpand },
+  computed: {},
+  watch: {},
+};
+</script>
+<style lang='scss' scoped>
+@import "@/assets/scss/modules/management/form-main.scss";
+@import "@/assets/scss/pages/resiAdd.scss";
+</style>
diff --git a/src/views/modules/hengAnXin/elderlyDatabase/components/checkPassword.vue b/src/views/modules/hengAnXin/elderlyDatabase/components/checkPassword.vue
new file mode 100644
index 000000000..1fc790e34
--- /dev/null
+++ b/src/views/modules/hengAnXin/elderlyDatabase/components/checkPassword.vue
@@ -0,0 +1,66 @@
+<template>
+  <el-dialog :title="title" :visible.sync="visible" append-to-body :before-close="handleClose">
+    <el-form :model="form" :rules="rules" ref="checkPasswordFrom" label-width="60px">
+      <el-form-item label="密码" prop="password">
+        <el-input v-model.trim="form.password" autocomplete="off" type="password" placeholder="请输入当前账号密码"
+          @keydown.native.enter="handelClickCheckPassword"></el-input>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="handleClose">取 消</el-button>
+      <el-button type="primary" @click="handelClickCheckPassword">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: "keyPerCheckPassword",
+  props: {
+    title: {
+      type: String,
+      default: "密码验证"
+    },
+    visible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      form: {
+        password: ''
+      },
+      rules: {
+        password: [
+          { required: true, message: "请输入密码", trigger: "blur" },
+          {
+            min: 6,
+            max: 18,
+            message: "长度在 6 到 18 个字符",
+            trigger: "blur",
+          },
+        ],
+      },
+    }
+  },
+  methods: {
+    handelClickCheckPassword() {
+      this.$refs.checkPasswordFrom.validate(valid => {
+        if (valid) {
+          this.$emit("success", this.form.password);
+          this.handleClose();
+        }
+      });
+    },
+    handleClose() {
+      this.form.password = "";
+      this.$emit("update:visible", false);
+    },
+  }
+
+
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/modules/hengAnXin/elderlyDatabase/components/keyCategoryDialog.vue b/src/views/modules/hengAnXin/elderlyDatabase/components/keyCategoryDialog.vue
deleted file mode 100644
index 7c2d60735..000000000
--- a/src/views/modules/hengAnXin/elderlyDatabase/components/keyCategoryDialog.vue
+++ /dev/null
@@ -1,471 +0,0 @@
-<template>
-  <el-dialog :visible.sync="visible" :title="title" :close-on-click-modal="false" :close-on-press-escape="false"
-    width="950px" top="5vh" class="dialog-h" :before-close="handleCancel">
-    <div class="dialog-h-content scroll-h">
-      <el-form ref="ref_form" :inline="true" :model="formData" :disabled="title == '查看'" :rules="dataRule" class="form">
-        <!-- <el-form-item label="居民分类" label-width="150px" prop="categoryList">
-          <el-cascader ref="categoryAll" size="small" class="item_width_1 custom-cascader"
-            v-model.trim="formData.categoryList" :options="categoryAllList"
-            :props="{ multiple: true, checkStrictly: true, emitPath: false }" clearable></el-cascader>
-        </el-form-item> -->
-
-        <el-form-item label="类别名称" prop="importantName" label-width="150px">
-          <el-input v-model.trim="formData.importantName" size="small" clearable placeholder="请输入"
-            class="item_width_1"></el-input>
-        </el-form-item>
-
-        <el-form-item class="full" label="居民分类" label-width="150px" prop="categoryList">
-          <el-table border ref="tableBox" :data="tableData" :row-style="{ height: '50px' }"
-            :cell-style="{ padding: '0px' }" style="width: 100%">
-            <el-table-column prop="province" label="标签" width="120" align="center">
-            </el-table-column>
-            <el-table-column prop="city" label="内容" align="left" show-overflow-tooltip>
-              <template slot-scope="scope">
-                <div v-if="scope.row.type == 'radio'" style="white-space: normal; word-break: break-all;">
-                  <el-radio-group v-model.trim="scope.row.value" v-for="(item, index) in scope.row.option" :key="index"
-                    @change="handleClickRadio(index, scope.$index)">
-                    <el-radio :label="item.value" :disabled="item.disabled"><span
-                        style="margin-right: 50px;" :value="item.value">{{ item.label
-                        }}</span></el-radio>
-                  </el-radio-group>
-                </div>
-                <div v-if="scope.row.type == 'checkbox'" :prop="'tableData.' + scope.$index + '.value'"
-                  style="white-space: normal; word-break: break-all;">
-                  <el-checkbox-group v-model.trim="scope.row.value">
-                    <el-checkbox @change="(val) => handleClickCheckbox(val, item)"
-                      :disabled="item.disabled" v-for="(item, index) in scope.row.option"
-                      :key="index" :label="item.value">{{ item.label
-                      }}</el-checkbox>
-                  </el-checkbox-group>
-                </div>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div class="div_btn">
-      <el-button size="small" @click="handleCancel" :loading="btnDisable">取 消</el-button>
-      <el-button size="small" type="primary" :loading="btnDisable" @click="handleConfirm">确 定</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import _ from 'lodash'
-import { Loading } from 'element-ui' // 引入Loading服务
-import { requestPost } from '@/js/dai/request'
-import { categoryAllList } from '@/utils/enum.js';
-import { requestGet } from "@/js/dai/request";
-
-const defaultFormData = {
-  id: undefined,
-  importType: 'normal',
-  importantName: '',
-  categoryList: []
-}
-
-const defaultTableData = [
-  {
-    index: 0,
-    province: '政治面貌',
-    value: 0,
-    type: 'radio',
-    option: [
-      { label: '群众', value: 'partyFlag0' },
-      { label: '党员', value: 'partyFlag1' },
-      { label: '共青团员', value: 'partyFlag2' },
-    ]
-  },
-  {
-    index: 1,
-    province: '健康状态',
-    value: [],
-    type: 'checkbox',
-    option: [
-      {
-        label: '残疾',
-        value: 'DISABILITY_FLAG'
-      },
-      {
-        label: '大病',
-        value: 'SERIOUS_ILLNESS_FLAG'
-      },
-      {
-        label: '慢病',
-        value: 'CHRONIC_DISEASE_FLAG'
-      }
-    ]
-  },
-  {
-    index: 2,
-    province: '关注人群',
-    value: [],
-    type: 'checkbox',
-    option: [
-      {
-        label: '老年人',
-        value: 'OLD_PEOPLE_FLAG',
-      },
-      // {
-      //   label: "失能老人",
-      //   value: "DISABLED_FLAG",
-      // },
-      // {
-      //   label: "空巢老人",
-      //   value: "EMPTY_NESTER_FLAG",
-      // },
-      // {
-      //   label: "失智老人",
-      //   value: "DEMENTED_FLAG",
-      // },
-      // {
-      //   label: "独居老人",
-      //   value: "LIVE_ALONE_FLAG",
-      // },
-      // {
-      //   label: "普通老年人",
-      //   value: "OLD_PEOPLE_FLAG",
-      // },
-      {
-        label: '低保',
-        value: 'SUBSISTENCE_ALLOWANCE_FLAG'
-      },
-      {
-        label: '退役军人',
-        value: 'VETERAN_FLAG'
-      },
-      {
-        label: '保障房人员',
-        value: 'ENSURE_HOUSE_FLAG'
-      },
-      {
-        label: '育龄妇女',
-        value: 'FERTILE_WOMAN_FLAG'
-      },
-      {
-        label: '特扶人员',
-        value: 'SPECIAL_SUPPORT_FLAG'
-      }, {
-        label: '留守儿童',
-        value: 'LBC_FLAG'
-      }, {
-        label: '艾滋病人员',
-        value: 'AIDS_FLAG'
-      }, {
-        label: '流动人员',
-        value: 'FLOATING_FLAG'
-      }, {
-        label: '新阶层人士',
-        value: 'NEW_STRATUM_FLAG'
-      }, {
-        label: '新就业群体',
-        value: 'NEG_FLAG'
-      }, {
-        label: '失业人员',
-        value: 'UNEMPLOYED_FLAG'
-      }
-    ]
-  },
-  {
-    index: 3,
-    province: '特殊人群',
-    value: [],
-    type: 'checkbox',
-    option: []
-  },
-  {
-    index: 4,
-    province: '身份',
-    value: [],
-    type: 'checkbox',
-    option: [
-      {
-        label: '志愿者',
-        value: 'VOLUNTEER_FLAG'
-      },
-      {
-        label: '网格员',
-        value: 'GRID_MEMBER_FLAG'
-      },
-      {
-        label: '楼长',
-        value: 'BUILDING_CHIEF_FLAG'
-      },
-      {
-        label: '单元长',
-        value: 'UNIT_CHIEF_FLAG'
-      },
-      {
-        label: '公益岗',
-        value: 'PUBLIC_WELFARE_FLAG'
-      }
-    ]
-  },
-];
-
-let loading // 加载动画
-export default {
-  name: 'revitalizeDialog',
-  components: {},
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
-    },
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      categoryAllList: _.cloneDeep(categoryAllList),
-      formData: _.cloneDeep(defaultFormData),
-      btnDisable: false,
-      tableData: _.cloneDeep(defaultTableData),
-    }
-  },
-
-  mounted() {
-
-  },
-  methods: {
-    async initForm(row) {
-      const { data } = await requestPost('/sys/dict/data/dictlist', { dictType: 'special_resident_category' });
-      this.tableData[3].option = data;
-      if (row && row.id) {
-        this.startLoading()
-        let url = `/actual/base/residentCategoryImportant/detail/${row.id}`
-        const { data, code, msg } = await requestGet(url)
-        this.formData = data ? data : _.cloneDeep(defaultFormData)
-        // 根据categoryCodeList设置option.selected为true并赋值给radio/checkbox
-        if (data && data.categoryCodeList) {
-          this.tableData.forEach(row => {
-            // 处理单选框
-            if (row.type === 'radio') {
-              const matchedItem = row.option.find(item => data.categoryCodeList.includes(item.value));
-              if (matchedItem) {
-                row.value = matchedItem.value;
-                matchedItem.selected = true;
-              }
-            }
-            // 处理复选框
-            else if (row.type === 'checkbox') {
-              row.value = row.option
-                .filter(item => data.categoryCodeList.includes(item.value))
-                .map(item => item.value);
-            }
-
-            // 设置selected状态
-            row.option.forEach(item => {
-              item.selected = data.categoryCodeList.includes(item.value);
-            });
-          });
-          this.handleCategoryList();
-        }
-        this.endLoading()
-      }
-    },
-
-    handleClickRadio(index, rowIndex) {
-      this.tableData[rowIndex].option.forEach((item, i) => {
-        if (i === index) item.selected = true
-        else item.selected = false
-      })
-      this.handleCategoryList();
-    },
-    handleClickCheckbox(val, item) {
-      item.selected = val;
-      this.handleCategoryList();
-      // item.index = index;
-      // if (event) {
-      //   this.$emit('showDialog', item, event)
-      // } else {
-      //   this.$confirm(`确认取消${item.label}标签`, '确认信息', {
-      //     confirmButtonText: '确认取消',
-      //     cancelButtonText: '暂不取消',
-      //     type: 'warning'
-      //   }).then(() => {
-      //     this.$emit('showDialog', item, event)
-      //   }).catch(() => {
-      //     this.formData.tableData[index].value.push(item.value)
-      //   });
-      // }
-    },
-
-    // 添加类别
-    handleCategoryList() {
-      this.formData.categoryList = this.tableData.flatMap(row =>
-        row.option.filter(item => item.selected).map(item => item.value)
-      );
-      console.log('this.formData.categoryList===', this.formData.categoryList)
-      this.$refs.ref_form.validateField('categoryList')
-    },
-    async handleConfirm() {
-      this.$refs['ref_form'].validate(async valid => {
-        if (valid) {
-          this.btnDisable = true
-          let url = this.formData.id ? '/actual/base/residentCategoryImportant/update' : '/actual/base/residentCategoryImportant/create'
-          const { data, code, internalMsg } = await requestPost(url, this.formData)
-          if (code === 0) {
-            this.$message.success(this.formData.id ? '更新成功' : '新增成功')
-            this.resetData()
-            this.$emit('update:visible', false)
-            this.$emit('success')
-          } else {
-            this.$message.error(internalMsg)
-          }
-          this.btnDisable = false
-        }
-      })
-    },
-
-    // 取消
-    handleCancel() {
-      this.resetData()
-      this.$emit('update:visible', false)
-    },
-
-    resetData() {
-      this.formData = _.cloneDeep(defaultFormData);
-      this.tableData = _.cloneDeep(defaultTableData);
-      this.$nextTick(() => {
-        this.$refs['ref_form'].resetFields();
-      })
-    },
-    // 开启加载动画
-    startLoading() {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
-    },
-    // 结束加载动画
-    endLoading() {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close()
-      }
-    },
-    // 更新分类标签
-    updateCategoryTags() {
-      this.$nextTick(() => {
-        const cascaderEl = this.$refs.categoryAll.$el;
-        const tagsContainer = cascaderEl.querySelector('.el-cascader__tags');
-        const tags = tagsContainer.querySelectorAll('.el-tag');
-
-        // 移除已存在的+n标签
-        const moreTag = tagsContainer.querySelector('.el-tag-more');
-        if (moreTag) {
-          moreTag.remove();
-        }
-
-        // 恢复所有标签显示
-        tags.forEach(tag => {
-          tag.style.display = 'inline-block';
-        });
-
-        // 计算可见标签数量
-        let visibleCount = 0;
-        let containerWidth = tagsContainer.offsetWidth;
-        let totalWidth = 0;
-        const tagMargin = 7;
-
-        for (let i = 0; i < tags.length; i++) {
-          const tag = tags[i];
-          const tagWidth = tag.offsetWidth;
-
-          // 第一个标签没有左边距
-          const margin = i > 0 ? tagMargin : 0;
-
-          if (totalWidth + tagWidth + margin > containerWidth && visibleCount > 0) {
-            break;
-          }
-
-          totalWidth += tagWidth + margin;
-          visibleCount++;
-        }
-
-        // 隐藏超出的标签并显示+n标签
-        if (visibleCount < tags.length) {
-          const hiddenCount = tags.length - visibleCount;
-
-          // 隐藏超出的标签（包括前面一个标签）
-          const startHideIndex = visibleCount > 0 ? visibleCount - 1 : 0;
-          for (let i = startHideIndex; i < tags.length; i++) {
-            tags[i].style.display = 'none';
-          }
-
-          // 创建+n标签
-          const moreTag = document.createElement('span');
-          moreTag.className = 'el-tag el-tag--info el-tag--mini el-tag--light el-tag-more';
-          moreTag.textContent = `+${hiddenCount + (startHideIndex > 0 ? 1 : 0)}`;
-          moreTag.style.marginLeft = '8px';
-          tagsContainer.appendChild(moreTag);
-        }
-      });
-    }
-  },
-  computed: {
-    dataRule() {
-      return {
-        categoryList: [
-          { required: true, message: '请选择分类', trigger: 'change' }
-        ],
-        importantName: [
-          { required: true, message: '请输入类别名称', trigger: 'blur' }
-        ],
-      }
-    },
-
-  },
-  watch: {
-    // 'formData.categoryList': {
-    //   handler(newVal) {
-    //     this.$nextTick(() => {
-    //       this.updateCategoryTags()
-    //     })
-    //   },
-    //   deep: true
-    // }
-  }
-
-}
-</script>
-
-
-<style lang="scss" scoped>
-.form {
-  margin-top: 16px;
-}
-
-.item_width_1 {
-  width: 560px;
-
-}
-
-.custom-cascader {
-  ::v-deep .el-cascader__tags {
-    flex-wrap: nowrap;
-    overflow: hidden;
-  }
-}
-
-.full {
-  width: 100%;
-  display: flex;
-
-  ::v-deep .el-form-item__content {
-    flex: 1;
-  }
-}
-
-.div_btn {
-  width: 100%;
-  text-align: right;
-  padding-right: 20px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/hengAnXin/elderlyDatabase/editElderlyDatabase.vue b/src/views/modules/hengAnXin/elderlyDatabase/editElderlyDatabase.vue
new file mode 100644
index 000000000..6ebc19331
--- /dev/null
+++ b/src/views/modules/hengAnXin/elderlyDatabase/editElderlyDatabase.vue
@@ -0,0 +1,2177 @@
+<template>
+  <div class="div_form" v-loading="loading">
+    <div class="form">
+      <el-form :model="form" :rules="rules" label-width="105px" ref="editForm">
+        <h5 style="margin-top: 6px">基础信息登记</h5>
+        <div class="flex_box">
+              <el-form-item
+                label="姓名"
+                prop="baseInfoDto.name"
+                class="font-color-orange flex_item_width1"
+              >
+                <el-input
+                  class="list_item_width_1"
+                  v-model.trim="form.baseInfoDto.name"
+                  placeholder="请输入内容"
+                  size="small"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            
+              <el-form-item
+                label="证件类型"
+                prop="baseInfoDto.idType"
+                class="font-color-orange flex_item_width1"
+              >
+                <el-select
+                  v-model.trim="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-form-item
+                label="证件号"
+                prop="baseInfoDto.idNum"
+                class="flex_item_width1"
+              >
+                <el-input
+                  v-model.trim="form.baseInfoDto.idNum"
+                  placeholder="请输入内容"
+                  clearable
+                  size="small"
+                  class="list_item_width_1"
+                  @blur="handleValidBlur"
+                ></el-input>
+              </el-form-item>
+          
+              <el-form-item
+                label="国籍"
+                prop="baseInfoDto.nationality"
+                class="font-color-orange flex_item_width1"
+              >
+                <el-select
+                  v-model.trim="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-form-item
+                label="联系电话"
+                prop="baseInfoDto.mobile"
+                class="font-color-orange flex_item_width1"
+              >
+                <el-input
+                  class="list_item_width_1"
+                  v-model.trim="form.baseInfoDto.mobile"
+                  placeholder="请输入内容"
+                  size="small"
+                  clearable
+                ></el-input>
+              </el-form-item>
+           
+              <el-form-item label="性别" prop="baseInfoDto.gender" class="flex_item_width1">
+                <el-select
+                  v-model.trim="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-form-item label="出生日期" class="flex_item_width1" prop="baseInfoDto.birthday">
+                <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-form-item label="民族" class="flex_item_width1" prop="baseInfoDto.nation">
+                <el-select
+                  v-model.trim="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-form-item label="文化程度" class="flex_item_width1" prop="eduInfoDto.cultureLevel">
+                <el-select
+                  v-model.trim="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-form-item label="婚姻状况" class="flex_item_width1" prop="familyInfoDto.marriage">
+                <el-select
+                  v-model.trim="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-form-item
+              class="flex_item_width1"
+                label="配偶情况"
+                prop="familyInfoDto.spouseSituation"  v-if="
+                (form.familyInfoDto &&
+                  form.familyInfoDto.marriage == 'chuhun') ||
+                form.familyInfoDto.marriage == 'zaihun' ||
+                form.familyInfoDto.marriage == 'fuhun'
+              "
+              >
+                <el-select
+                  v-model.trim="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-form-item label="籍贯" class="flex_item_width1" prop="baseInfoDto.nativePlace">
+                <el-input
+                  v-model.trim="form.baseInfoDto.nativePlace"
+                  placeholder="请输入内容"
+                  clearable
+                  size="small"
+                  class="list_item_width_1"
+                ></el-input>
+                <el-radio-group v-model.trim="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-form-item label="备注" prop="baseInfoDto.remark" class="flex_item_width2">
+            <el-input
+              type="textarea"
+              class="item_width_1"
+              :rows="3"
+              placeholder="请输入内容"
+              v-model.trim="form.baseInfoDto.remark"
+              clearable
+            >
+            </el-input>
+          </el-form-item>
+        </div>
+        <h5>居住信息登记</h5>
+          <section
+            v-for="(rowItem, index) in this.form.resideInfoDtos"
+            :key="index"
+          >
+          <div class="flex_box">  
+             <el-form-item
+                  label="所属组织"
+                  class="font-color-orange flex_item_width1"
+                  :prop="`resideInfoDtos[${index}].gridId`"
+                  :rules="[
+                    {
+                      required: true,
+                      message: '请选择所属组织',
+                      trigger: 'blur',
+                    },
+                  ]"
+                >
+                  <el-cascader
+                    class="list_item_width_1"
+                    ref="myCascader"
+                    clearable
+                    size="small"
+                    v-model.trim="form.resideInfoDtos[index].gridId"
+                    :options="form.resideInfoDtos[index].orgOptions"
+                    :props="orgOptionProps"
+                    @change="handleChangeAgency(index)"
+                    :disabled="rowItem.accessable === 0"
+                  ></el-cascader>
+                </el-form-item>
+            
+                <el-form-item
+                  :prop="`resideInfoDtos[${index}].villageId`"
+                  label="所属房屋"
+                  label-width="100px"
+                  class="font-color-orange flex_item_width4"
+                  :rules="[
+                    { required: true, message: '请选择小区', trigger: 'blur' },
+                  ]"
+                >
+                  <el-select
+                    v-model.trim="form.resideInfoDtos[index].villageId"
+                    placeholder="请选择小区"
+                    size="small"
+                    class=" f-bto0"
+                    clearable
+                    @change="handleChangeV(index)"
+                    :disabled="rowItem.accessable === 0"
+                  >
+                    <el-option
+                      v-for="item in rowItem.optionsV"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </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="flex_item_width3 f-bto0"
+                    :disabled="rowItem.accessable === 0"
+                  >
+                    <el-option
+                      v-for="item in rowItem.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="flex_item_width3 f-bto0"
+                    @change="handleChangeD(index)"
+                    :disabled="rowItem.accessable === 0"
+                  >
+                    <el-option
+                      v-for="item in rowItem.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' },
+                  ]"
+                  :disabled="rowItem.accessable === 0"
+                >
+                  <el-select
+                    v-model.trim="form.resideInfoDtos[index].homeId"
+                    placeholder="房号"
+                    size="small"
+                    clearable
+                    class="flex_item_width3 f-bto0"
+                    @change="handleChangeH(index)"
+                    :disabled="rowItem.accessable === 0"
+                  >
+                    <el-option
+                      v-for="item in rowItem.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 && rowItem.accessable !== 0"
+                  size="small"
+                  icon="el-icon-minus"
+                  @click="handelClickDelHouse(index)"
+                  style="height: 30px"
+                  circle
+                >
+                </el-button>
+              </div>
+          <div class="flex_box">
+            <el-form-item label="人房关系" class="font-color-blue flex_item_width1">
+                  <el-select
+                    v-model.trim="form.resideInfoDtos[index].resiHouseRel"
+                    placeholder="请选择"
+                    size="small"
+                    class="list_item_width_1"
+                    @change="handelChangeResiHouseRel($event, index)"
+                    clearable
+                    :disabled="rowItem.accessable === 0"
+                  >
+                    <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-form-item label="人户状况" class="font-color-blue flex_item_width1">
+                  <el-select
+                    v-model.trim="form.resideInfoDtos[index].householdSituation"
+                    placeholder="请选择"
+                    size="small"
+                    class="list_item_width_1"
+                    clearable
+                    :disabled="rowItem.accessable === 0"
+                  >
+                    <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-form-item
+                  label="与户主关系"
+                  class="font-color-blue font-color-blue2 flex_item_width1"
+                >
+                  <el-select
+                    v-model.trim="form.resideInfoDtos[index].houseHolderRel"
+                    placeholder="请选择"
+                    size="small"
+                    class="list_item_width_1"
+                    clearable
+                    :disabled="rowItem.accessable === 0"
+                  >
+                    <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-form-item label="户籍所在地" v-if="form.resideInfoDtos[index].householdSituation == 'rzhbz'" class="flex_item_width1">
+                  <el-input
+                    class="list_item_width_1"
+                    v-model.trim="form.resideInfoDtos[index].placeOfDomicile"
+                    placeholder="请输入内容"
+                    size="small"
+                    clearable
+                    :disabled="rowItem.accessable === 0"
+                  ></el-input>
+                </el-form-item>
+             
+                <el-form-item label="现居住地址"   v-else-if="
+                  form.resideInfoDtos[index].householdSituation == 'hzrbz'
+                " class="flex_item_width1">
+                  <el-input
+                    class="list_item_width_1"
+                    v-model.trim="form.resideInfoDtos[index].currentResidence"
+                    placeholder="请输入内容"
+                    size="small"
+                    :disabled="rowItem.accessable === 0"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+             
+                <el-form-item label="迁出时间" 
+                 class="flex_item_width1"  v-else-if="
+                  form.resideInfoDtos[index].householdSituation == 'rhdbz'
+                ">
+                  <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"
+                    :disabled="rowItem.accessable === 0"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+          </div> 
+          </section>
+        <h5>拓展信息登记</h5>
+        <div class="flex_box">
+         
+              <el-form-item class="flex_item_width1" label="宗教信仰" prop="religionDto.religion">
+                <el-input
+                  class="list_item_width_1"
+                  v-model.trim="form.religionDto.religion"
+                  placeholder="请输入内容"
+                  size="small"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            
+              <el-form-item
+                label="就业状态"
+                class="font-color-blue flex_item_width1"
+                prop="workInfoDto.careerStatus"
+              >
+                <el-select
+                  v-model.trim="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-form-item label="工作单位" class="flex_item_width1" prop="workInfoDto.workUnit" v-if="
+                form.workInfoDto.careerStatus >= 1 &&
+                form.workInfoDto.careerStatus <= 5
+              ">
+                <el-input
+                  class="list_item_width_1"
+                  v-model.trim="form.workInfoDto.workUnit"
+                  placeholder="请输入内容"
+                  size="small"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            
+              <el-form-item  v-if="
+                form.workInfoDto.careerStatus >= 1 &&
+                form.workInfoDto.careerStatus <= 5
+              " label="职业" class="flex_item_width1" prop="workInfoDto.occupation">
+                <el-input
+                  class="list_item_width_1"
+                  v-model.trim="form.workInfoDto.occupation"
+                  placeholder="请输入内容"
+                  size="small"
+                  clearable
+                ></el-input>
+              </el-form-item>
+       
+              <el-form-item label="月收入" class="flex_item_width1"  v-if="
+              form.workInfoDto.careerStatus >= 1 &&
+              form.workInfoDto.careerStatus <= 5
+            " prop="economyDto.monthIncome">
+                <el-input
+                  class="list_item_width_1"
+                  v-model.trim="form.economyDto.monthIncome"
+                  placeholder="请输入内容"
+                  size="small"
+                  clearable
+                ></el-input>
+              </el-form-item>
+           
+              <el-form-item label="有无赡养人" class="flex_item_width1" prop="familyInfoDto.elderlyFlag">
+                <el-radio-group v-model.trim="form.familyInfoDto.elderlyFlag">
+                  <el-radio
+                    :label="item.value"
+                    v-for="item in hasOptions"
+                    :key="item.value"
+                    @click.native="handelClickelderly"
+                    >{{ item.label }}</el-radio
+                  >
+                </el-radio-group>
+              </el-form-item>
+          
+              <el-form-item
+              v-if="form.familyInfoDto.elderlyFlag == 1" class="flex_item_width1"
+                label="与赡养人关系"
+                prop="familyInfoDto.elderlyRelation"
+              >
+                <el-select
+                  v-model.trim="form.familyInfoDto.elderlyRelation"
+                  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-form-item
+              v-if="form.familyInfoDto.elderlyFlag == 1" class="flex_item_width1"
+                label="赡养人联系电话"
+                prop="familyInfoDto.dependantMobile"
+              >
+                <el-input
+                  class="list_item_width_1"
+                  v-model.trim="form.familyInfoDto.dependantMobile"
+                  placeholder="请输入内容"
+                  size="small"
+                  clearable
+                ></el-input>
+              </el-form-item>
+        </div>
+        <h5>人员标签</h5>
+        <div class="stafftag">
+          <stafftag
+            :formType="'edit'"
+            ref="stafftag"
+            :userInfo="form"
+            @showDialog="showDialog"
+          >
+          </stafftag>
+        </div>
+        <resi-expand
+          ref="resiExpand"
+          @submitExpand="submitExpand"
+        ></resi-expand>
+        <el-row style="margin: 24px">
+          <el-col :span="24" align="center">
+            <el-button
+              size="small"
+              class="diy-button--white"
+              @click="handlerCancle"
+              plain
+              >取消</el-button
+            >
+            <el-button
+              type="primary"
+              size="small"
+              @click="handleClickSubmit"
+              :loading="btnLoading"
+              >保存</el-button
+            >
+            <el-button
+              type="primary"
+              size="small"
+              @click="handleClickSubmit('house')"
+              :loading="btnLoading"
+              >提交并补充重点人员信息</el-button
+            >
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" destroy-on-close width="1028px">
+            <add-expand ref="addExpand" @submitExpand="submitExpandAdd" @hideExpand="hideExpand"
+                :operationType="'add'"></add-expand>
+        </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import { requestGet, requestPost } from "@/js/dai/request";
+import {
+  isCard,
+  isPassport,
+  isMobile,
+  isPhone,
+  isHKPassport,
+  isTwPassport,
+  isSoldier,
+} from "@/utils/validate";
+import { computedCard } from "@/utils/index";
+import {
+  idTypeList,
+  genderList,
+  hasOptions,
+  disabilityFlagList,
+} from "@/js/columns/constants";
+import stafftag from "@/views/modules/portrayal/jumin/cpts/staffTag.vue";
+import resiExpand from "@/views/components/resiExpand/editExpand.vue";
+import addExpand from "@/views/components/resiExpand/index.vue";
+
+export default {
+  name: 'editKeyPersonnel',
+  data() {
+    return {
+      loading: false,
+      dialogTitle:null,
+      dialogVisible:false,
+      houseType: true,
+      formList: [],
+      orgOptions: [],
+      orgOptionProps: {
+        value: "agencyId",
+        label: "agencyName",
+        children: "subAgencyList",
+        emitPath: false,
+        multiple: false,
+        checkStrictly: true,
+      },
+
+      resiId: this.$route.query.id,
+      form: {
+        baseInfoDto: {
+          name: null, //姓名
+          idType: null, //证件类型
+          idNum: null, //身份证号
+          nationality: null, //国籍
+          mobile: null, //手机号
+          gender: null, //性别
+          birthday: null, //出生日期
+          nation: null, //民族
+          localResidenceFlag: 0, //是否本地户籍
+          nativePlace: null, //籍贯,
+          remark: null, //备注,
+          deathFlag:0,//死亡
+          deathDate:null,//死亡日期
+          categoryInfo: {
+            partyFlag: 0,
+            subsistenceAllowanceFlag: 0,
+            ensureHouseFlag: 0,
+            unemployedFlag: 0,
+            fertileWomanFlag: 0,
+            veteranFlag: 0,
+            unitedFrontFlag: 0,
+            petitionOfficerFlag: 0,
+            volunteerFlag: 0,
+            oldPeopleFlag: 0,
+            emptyNesterFlag: 0,
+            specialSupportFlag: 0,
+            disabledFlag: 0,
+            dementedFlag: 0,
+            disabilityFlag: 0,
+            seriousIllnessFlag: 0,
+            chronicDiseaseFlag: 0,
+            specialCrowdFlag: 0,
+            tenantFlag: 0,
+            floatingFlag: 0,
+            liveAloneFlag: 0,
+            publicWelfareFlag: 0,
+            buildingChiefFlag: 0,
+            unitChiefFlag: 0,
+            riskyFlag: 0,
+            delFlag: 0,
+            aidsFlag:0,
+            lbcFlag:0,
+            negFlag :0
+          },
+        },
+        eduInfoDto: {
+          cultureLevel: null, //文化程度
+        },
+        familyInfoDto: {
+          marriage: null, //婚姻状况
+          spouseSituation: null, //配偶情况
+          elderlyFlag: null, //有无赡养人
+          elderlyRelation: null, //与赡养人关系
+          dependantMobile: null, //赡养人联系电话
+        },
+        resideInfoDtos: [
+          {
+            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: [],
+            orgOptions: [],
+          },
+        ],
+        religionDto: {
+          religion: null, //宗教信仰
+        },
+        workInfoDto: {
+          careerStatus: null, //就业状况
+          workUnit: null, //工作单位
+          occupation: null, //职业
+        },
+        specialDto: {
+          specialCategoryCodes: [],
+        },
+        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, //劳动能力就业愿望
+        },
+        economyDto: {
+          monthIncome: null, //月收入
+        },
+      },
+      orgOption: [],
+      footerInputList: [
+        {
+          id: "healthDto",
+
+          children: [
+            {
+              label: "残疾类别",
+              check:'fourFont',
+              itemType: "select1",
+              pformName: "healthDto",
+              formName: "disabilityCategoryCode",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "disability_category_code" },
+              opction: [],
+            },
+            {
+              label: "残疾等级",
+              itemType: "select1",
+              check:'fourFont',
+              pformName: "healthDto",
+              formName: "disabilityLevel",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "disability_level" },
+              opction: [],
+            },
+            {
+              label: "残疾证号",
+              pformName: "healthDto",
+              itemType: "input1",
+              check:'fourFont',
+              formName: "disabilityNum",
+            },
+            {
+              label: "残疾说明",
+              pformName: "healthDto",
+              itemType: "input1",
+              formName: "disabilityDesc",
+            },
+            {
+              label: "监护人",
+              itemType: "radio1",
+              pformName: "healthDto",
+              formName: "guardianFlag",
+              opction: [
+                { label: "有", formName: "", value: 1 },
+                { label: "无", formName: "", value: 0 },
+              ],
+            },
+            {
+              label: "监护人姓名",
+              pformName: "healthDto",
+              itemType: "input1",
+              formName: "guardianName",
+            },
+            {
+              label: "监护人联系电话",
+              pformName: "healthDto",
+              itemType: "input1",
+              formName: "guardianMobile",
+            },
+            {
+              label: "技能特长",
+              pformName: "healthDto",
+              itemType: "radio1",
+              formName: "specialSkillFlag",
+              opction: [
+                { label: "有", formName: "", value: 1 },
+                { label: "无", formName: "", value: 0 },
+              ],
+            },
+            {
+              label: "劳动能力",
+              pformName: "healthDto",
+              itemType: "radio1",
+              formName: "workCapacityFlag",
+              opction: [
+                { label: "有", formName: "", value: 1 },
+                { label: "无", formName: "", value: 0 },
+              ],
+            },
+          ],
+        },
+        {
+          id: "seriousIllnessDto",
+          children: [
+            {
+              label: "所患大病",
+              itemType: "checkbox",
+              check:'fourFont',
+              formName: "illnessCodes",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "illness_code" },
+              opction: [],
+              pformName: "seriousIllnessDto",
+            },
+          ],
+        },
+        {
+          id: "chronicDiseaseDto",
+          children: [
+            {
+              label: "所患慢病",
+              itemType: "checkbox",
+              check:'fourFont',
+              formName: "chronicDiseaseCodes",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "chronic_disease_code" },
+              opction: [],
+              pformName: "chronicDiseaseDto",
+            },
+          ],
+        },
+        {
+          id: "baseInfoDto",
+          children: [
+            {
+              label: "死亡时间",
+              itemType: "datepicker1",
+              formName: "deathDate",
+              check:'fourFont',
+              pformName: "baseInfoDto",
+            },
+          ],
+        },
+        {
+          id: "oldPeopleDto",
+          children: [
+            {
+              label: "老年人分类",
+              itemType: "checkbox",
+              check:'fiveFont',
+              formName: "oldPeopleCategories",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "oldPeople_categories" },
+              pformName: "oldPeopleDto",
+              opction:[]
+            },
+            {
+              label: "居住情况",
+              itemType: "select1",
+              check:'fourFont',
+              formName: "resideSituation",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "reside_situation" },
+              pformName: "oldPeopleDto",
+              opction:[]
+            },
+            {
+              label: "高龄补助",
+              itemType: "inputNum",
+              formName: "oldSubsidy",
+              // check:'fourFont',
+              pformName: "oldPeopleDto",
+            },
+          ],
+        },
+        {
+          id: "subsistenceAllowanceDto",
+          children: [
+            {
+              label: "低保类别",
+              itemType: "select1",
+              check:'fourFont',
+              formName: "category",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "subsistence_allowance_category" },
+              pformName: "subsistenceAllowanceDto",
+              opction: [],
+            },
+            {
+              label: "低保享受原因",
+              itemType: "checkbox",
+              check:'sixFont',
+              formName: "reasons",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "subsistence_allowance_reasons" },
+              opction: [],
+              pformName: "subsistenceAllowanceDto",
+            },
+          ],
+        },
+        {
+          id: "parymemberInfoDto",
+          children: [
+            {
+              check:'fourFont',
+              label: "入党时间",
+              itemType: "datepicker1",
+              formName: "joinTime",
+              pformName: "parymemberInfoDto",
+              opction: [],
+            },
+            {
+              label: "转正时间",
+              itemType: "datepicker1",
+              formName: "positiveTime",
+              pformName: "parymemberInfoDto",
+              opction: [],
+            },
+            {
+              check:'fiveFont',
+              label: "所属党组织",
+              itemType: "cascader1",
+              formName: "partyOrgId",
+              pformName: "parymemberInfoDto",
+              opction: [],
+            },
+            {
+              label: "流动党员",
+              itemType: "radio1",
+              formName: "flowFlag",
+              pformName: "parymemberInfoDto",
+              opction: [
+                { label: "是", value: 1 },
+                { label: "否", value: 0 },
+              ],
+            },
+            {
+              label: "流动党员活动证号",
+              itemType: "input1",
+              formName: "flowActNum",
+              pformName: "parymemberInfoDto",
+            },
+            {
+              label: "党组织职务",
+              itemType: "select1",
+              formName: "partyJob",
+              check:'fiveFont',
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "party_job" },
+              pformName: "parymemberInfoDto",
+              opction: [],
+            },
+            {
+              label: "工作职责",
+              itemType: "input1",
+              formName: "duty",
+              pformName: "parymemberInfoDto",
+            },
+            {
+              label: "是否退休",
+              itemType: "radio1",
+              formName: "retiredFlag",
+              pformName: "parymemberInfoDto",
+              opction: [
+                { label: "是", value: 1 },
+                { label: "否", value: 0 },
+              ],
+            },
+            {
+              label: "党员中心户",
+              itemType: "radio1",
+              check:'fiveFont',
+              formName: "centerFlag",
+              pformName: "parymemberInfoDto",
+              opction: [
+                { label: "是", value: 1 },
+                { label: "否", value: 0 },
+              ],
+            },
+            {
+              label: "免学习",
+              itemType: "radio1",
+              formName: "studyNotNeed",
+              pformName: "parymemberInfoDto",
+              opction: [
+                { label: "是", value: 1 },
+                { label: "否", value: 0 },
+              ],
+            },
+            {
+              label: "入党时所在党支部",
+              itemType: "input1",
+              formName: "joinBranchName",
+              pformName: "parymemberInfoDto",
+            },
+            {
+              label: "组织关系转入社区时间",
+              itemType: "datepicker1",
+              formName: "joinCommunityTime",
+              pformName: "parymemberInfoDto",
+              opction: [],
+            },
+          ],
+        },
+        {
+          id: "ensureHouseDto",
+          children: [
+            {
+              label: "所在社区",
+              itemType: "input1",
+              check:'fourFont',
+              formName: "liveCommunity",
+              pformName: "ensureHouseDto",
+            },
+            {
+              label: "住房性质",
+              itemType: "select1",
+              check:'fourFont',
+              formName: "housingNature",
+              opctionUrl: "sys/dict/data/house",
+              opctionParams: { formCode: "resi_base_info" },
+              pformName: "ensureHouseDto",
+              opction: [],
+            },
+          ],
+        },
+        {
+          id: "veteranDto",
+          children: [
+            {
+              label: "入伍日期",
+              itemType: "datepicker1",
+              check:'fourFont',
+              formName: "joinArmyTime",
+              pformName: "veteranDto",
+              opction: [],
+            },
+            {
+              label: "退伍日期",
+              check:'fourFont',
+              itemType: "datepicker1",
+              formName: "leaveArmyTime",
+              pformName: "veteranDto",
+              opction: [],
+            },
+            {
+              label: "服役单位",
+              itemType: "input1",
+              formName: "serviceUnit",
+              pformName: "veteranDto",
+            },
+            {
+              label: "接收单位",
+              itemType: "input1",
+              formName: "receiveUnit",
+              pformName: "veteranDto",
+            },
+            {
+              label: "待安置补助金",
+              itemType: "inputNum",
+              formName: "settlementAmount",
+              pformName: "veteranDto",
+              opction: [],
+            },
+            {
+              label: "培训状况",
+              itemType: "input1",
+              formName: "trainDesc",
+              pformName: "veteranDto",
+            },
+            {
+              label: "现就业情况",
+              itemType: "input1",
+              formName: "employmentSituation",
+              pformName: "veteranDto",
+            },
+            {
+              label: "是否办理公益性岗位",
+              check:'nineFont',
+              itemType: "radio1",
+              formName: "pubWelfareJobFlag",
+              pformName: "veteranDto",
+              opction: [
+                { label: "是", value: 1 },
+                { label: "否", value: 0 },
+              ],
+            },
+          ],
+        },
+        {
+          id: "unitedFrontDto",
+          children: [
+            {
+              label: "统战类型",
+              check:'fourFont',
+              itemType: "input1",
+              pformName: "unitedFrontDto",
+              formName: "unitedFrontType",
+            },
+          ],
+        },
+        {
+          id: "volunteerDto",
+          children: [
+            {
+              label: "志愿者类别",
+              itemType: "checkbox",
+              formName: "volunteerCategory",
+              pformName: "volunteerDto",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "VOLUNTEER_CATEGORY" },
+              opction: [],
+            },
+          ],
+        },
+        {
+          id: "specialSupportDto",
+          children: [
+            {
+              label: "特扶类别",
+              check:'fourFont',
+              itemType: "select1",
+              formName: "specialSupportType",
+              pformName: "specialSupportDto",
+              opction: [
+                {
+                  value: "1",
+                  label: "失独",
+                },
+                {
+                  value: "2",
+                  label: "伤残",
+                },
+              ],
+            },
+            {
+              //1
+              label: "子女姓名",
+              // check:'fourFont',
+              itemType: "input1",
+              formName: "childName",
+              pformName: "specialSupportDto",
+              opction: [],
+            },
+            {
+              //2
+              label: "子女性别",
+              itemType: "select1",
+              formName: "childGender",
+              pformName: "specialSupportDto",
+              opction: [
+                {
+                  value: "1",
+                  label: "男",
+                },
+                {
+                  value: "2",
+                  label: "女",
+                },
+              ],
+            },
+            {
+              label: "子女死亡日期",
+              itemType: "datepicker1",
+              formName: "childDeathDate",
+              pformName: "specialSupportDto",
+              opction: [],
+            },
+            {
+              label: "子女伤残类别",
+              itemType: "select1",
+              formName: "childDisabilityCategoryCode",
+              opctionUrl: "sys/dict/data/dictlist",
+              pformName: "specialSupportDto",
+              opctionParams: { dictType: "disability_category_code" },
+              opction: [],
+            },
+            {
+              label: "子女伤残等级",
+              itemType: "select1",
+              pformName: "specialSupportDto",
+              formName: "childDisabilityLevel",
+              opctionUrl: "sys/dict/data/dictlist",
+              opctionParams: { dictType: "disability_level" },
+              opction: [],
+            },
+          ],
+        }, 
+        {
+                   id:'unemployedDto',
+                   children:[
+                        {
+                            label: "原工作单位",
+                            itemType: "input1",
+                            formName: "originWorkUnit",
+                            pformName: "unemployedDto",
+                            opction: []
+                        },
+                        {
+                            label: "失业时间",
+                            itemType: "datepicker1",
+                            formName: "unemploymentTime",
+                            pformName: "unemployedDto",
+                            opction: []
+                        }, 
+                        {
+                            label: "失业证号",
+                            itemType: "input1",
+                            formName: "unemploymentNum",
+                            pformName: "unemployedDto",
+                            opction: []
+                        },
+                        {
+                            label: "失业原因",
+                            itemType: "select1",
+                            formName: "unemploymentReason",
+                            pformName: "unemployedDto",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'unemployment_reason' },
+                            opction: []
+                        },
+                        {
+                            label: "再就业优惠证号",
+                            itemType: "input1",
+                            pformName: "unemployedDto",
+                            formName: "employmentNum",
+                            opction: []
+                        },
+                        {
+                            label: "技术特长",
+                            itemType: "input1",
+                            pformName: "unemployedDto",
+                            formName: "specialSkill",
+                            opction: []
+                        },
+                        {
+                            label: "是否领取失业金",
+                            itemType: "radio1",
+                            pformName: "unemployedDto",
+                            formName: "unempCompensationFlag",
+                            opction: [
+                                { label: '是', value: 1 },
+                                { label: '否', value: 0 },
+                            ]
+                        },
+                        {
+                            label: "是否就业困难对象",
+                            itemType: "radio1",
+                            pformName: "unemployedDto",
+                            formName: "employmentHardFlag",
+                            opction: [
+                                { label: '是', value: 1 },
+                                { label: '否', value: 0 },
+                            ]
+                        },
+                        {
+                            label: "劳动就业愿望",
+                            itemType: "select1",
+                            formName: "employmentWish",
+                            pformName: "unemployedDto",
+                            opctionUrl: 'sys/dict/data/dictlist',
+                            opctionParams: { dictType: 'career_goals' },
+                            opction: []
+                        }
+                        
+                   ]
+        }
+      ],
+      workInfoDtoId: null,
+      idTypeList,
+      genderList,
+      hasOptions,
+      disabilityFlagList,
+
+      btnLoading: false,
+      rules: {
+        "baseInfoDto.name": [
+          { required: true, message: "请输入姓名", trigger: "blur" },
+        ],
+        "baseInfoDto.idType": [
+          { required: true, message: "请选择证件类型", trigger: "blur" },
+        ],
+        "baseInfoDto.idNum": [
+          { required: true, message: "请输入证件号码", trigger: "blur" },
+        ],
+        "baseInfoDto.mobile": [
+          { required: true, message: "请输入电话", trigger: "blur" },
+        ],
+        "baseInfoDto.nationality": [
+          { required: true, message: "请选择国籍", trigger: "blur" },
+        ],
+      },
+      dicts: {
+        educationList: [], //文化程度
+        nationList: [], //民族
+        nationalityList: [], //国籍
+        marriageList: [], //婚姻状况
+        householdSituationList: [], //人户状况
+        houseHolderRelList: [], //与户主关系
+        careerStatusList: [], //就业状况
+        spouseSituationList: [], //配偶情况
+        unemploymentReasonList: [], //失业原因
+        resiHouseRelList: [
+          {
+            label: "自住",
+            value: 0,
+          },
+          {
+            label: "租住",
+            value: 1,
+          },
+        ],
+      },
+      incidence: {
+        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: "baseInfoDto", formType: "baseInfoDto", 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: "志愿者",
+        },
+        unemployedFlag: {
+          formId: "unemployedDto",
+          formType: "unemployedDto",
+          title: "失业人员",
+        },
+      },
+      formCopy: null,
+    };
+  },
+  async created() {
+    this.formCopy = JSON.parse(JSON.stringify(this.form));
+  },
+  async activated() {
+    this.resiId = this.$route.query.id;
+    this.loading = true;
+    await this.getDicts();
+    await this.getOrgTreeListAll();
+    await this.getResiDetail();
+  },
+  methods: {
+    getResiDetail() {
+      this.$http
+        .get(`/actual/base/residentIntegratedInfo/detail/masked/${this.resiId}`)
+        .then((res) => {
+          if (res.data.code == 0) {
+            this.form = {};
+            this.form.resideInfoDtos = res.data.data.resideInfoDtos;
+            const promises = [];
+            this.$refs["resiExpand"].formList = [];
+            for (let i in this.form.resideInfoDtos) {
+              promises.push(this.getValiheList(i));
+              promises.push(this.getBuildList(i));
+              promises.push(this.getHouseList(i));
+              promises.push(this.getUniList(i));
+              this.form.resideInfoDtos[i].orgOptions = [];
+              this.getOrgTreeList(this.form.resideInfoDtos[i].agencyId, i);
+            }
+            this.form = { ...res.data.data };
+            this.form.baseInfoDto.idNum = this.$route.params.idNum;
+            this.form.baseInfoDto.mobile = this.$route.params.mobile;
+            this.form.baseInfoDto.name = this.$route.params.name;
+            if (!res.data.data.familyInfoDto) {
+              this.form.familyInfoDto = {
+                marriage: null, //婚姻状况
+                spouseSituation: null, //配偶情况
+                elderlyFlag: null, //有无赡养人
+                elderlyRelation: null, //与赡养人关系
+                dependantMobile: null, //赡养人联系电话
+              };
+            }
+            if (!res.data.data.religionDto) {
+              this.form.religionDto = {
+                religion: null, //宗教信仰
+              };
+            }
+            if (!res.data.data.workInfoDto) {
+              this.form.workInfoDto = {
+                careerStatus: null, //就业状况
+                workUnit: null, //工作单位
+                occupation: null, //职业
+              };
+            }
+            if (!res.data.data.eduInfoDto) {
+              this.form.eduInfoDto = {
+                cultureLevel: null,
+              };
+            }
+            if (!res.data.data.specialDto) {
+              this.form.specialDto = {
+                specialCategoryCodes: [],
+              };
+            }
+            if (!res.data.data.subsistenceAllowanceDto) {
+              this.form.subsistenceAllowanceDto = {
+                reasons: [],
+                category: null,
+              };
+            }
+            if (!res.data.data.unemployedDto) {
+              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, //劳动能力就业愿望
+              };
+            }
+            if (!res.data.data.oldPeopleDto) {
+              this.form.oldPeopleDto = {
+                    oldPeopleCategories: [],
+                    resideSituation: null,
+                    oldSubsidy: null
+                };
+            }
+            for (const key in this.form.baseInfoDto.categoryInfo) {
+              if (
+                (this.form.baseInfoDto.categoryInfo[key] === 1 &&
+                  this.incidence[key]) ||
+                (this.form.baseInfoDto.categoryInfo.partyFlag == 1 &&
+                  key === "partyFlag")
+              ) {
+                const formId = key === "partyFlag" ? "parymemberInfoDto" : key;
+                this.loadExpand({ index: key, value: formId }, true);
+                for (let i in this.footerInputList) {
+                  const incidenceFormId = this.incidence[formId].formId;
+                  if (this.footerInputList[i].id === incidenceFormId) {
+                    for (let index in this.footerInputList[i].children) {
+                      const formName =
+                        this.footerInputList[i].children[index].formName;
+                      const formData = this.form[incidenceFormId];
+                      if (
+                        formData &&
+                        Object.keys(formData).includes(formName)
+                      ) {
+                        if (
+                          this.footerInputList[i].children[index].itemType ==
+                          "cascader1"
+                        ) {
+                          this.footerInputList[i].children[index].orgPath =
+                            formData.partyOrgIdPath || null;
+                        }
+                        this.footerInputList[i].children[index].value =
+                          formData[formName] != null
+                            ? formData[formName]
+                            : null;
+                        this.footerInputList[i].children[index].id =
+                          formData.id;
+                      }
+                    }
+                  }
+                }
+              }
+            }
+            this.workInfoDtoId = this.form.workInfoDto.id;
+            this.loading = false;
+            return Promise.all(promises);
+          } else if (res.data.code >= 8000) {
+            this.$message.error(res.data.msg);
+            this.loading = false;
+          }
+        })
+        .then(() => {})
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+    async getDicts() {
+      try {
+        const requests = [
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "nationality",
+          }),
+          this.$http.post("sys/dict/data/nation", {
+            formCode: "resi_base_info",
+          }),
+          this.$http.post("sys/dict/data/education", {
+            formCode: "resi_base_info",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "marriage",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "household_situation",
+          }),
+          this.$http.post("sys/dict/data/relationship", {
+            formCode: "resi_base_info",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "career_status",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "spouse_situation",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "unemployment_reason",
+          }),
+        ];
+        const dictKeys = [
+          "nationalityList",
+          "nationList",
+          "educationList",
+          "marriageList",
+          "householdSituationList",
+          "houseHolderRelList",
+          "careerStatusList",
+          "spouseSituationList",
+          "unemploymentReasonList",
+        ]; // 对应的键名
+
+        const results = await Promise.all(requests);
+        results.forEach((result, index) => {
+          if (result.data.code === 0) {
+            this.dicts[dictKeys[index]].push(...result.data.data);
+          } else {
+            console.log(`获取${dictKeys[index]}失败: ${result.data.msg}`);
+          }
+        });
+      } catch (error) {
+        console.log("获取字典失败: ", error);
+      }
+    },
+    getOrgTreeList(id, i) {
+      this.$http
+        .post("/gov/org/customeragency/rootagencygridtree", { agencyId: id })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.form.resideInfoDtos[i].orgOptions.push(res.data);
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+          return this.$message.error("网络错误");
+        });
+    },
+    getOrgTreeListAll() {
+      this.$http
+        .post("/gov/org/customeragency/agencygridtree", {})
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.orgOption.push(res.data);
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    handelChangeResiHouseRel(val, index) {
+      this.form.resideInfoDtos[index].householdSituation =
+        val == 0 ? "rhyz" : "rzhbz";
+    },
+    handleChangeAgency(index) {
+      let obj = this.$refs[`myCascader`][index].getCheckedNodes()[0]
+        ? this.$refs["myCascader"][index].getCheckedNodes()[0].data
+        : null;
+      if (obj) {
+        if (obj.level === "grid") {
+          this.form.resideInfoDtos[index].gridId = obj.agencyId;
+          this.form.resideInfoDtos[index].agencyId = obj.pid;
+
+          this.form.resideInfoDtos[index].villageId = "";
+          this.form.resideInfoDtos[index].buildId = "";
+          this.form.resideInfoDtos[index].unitId = "";
+          this.form.resideInfoDtos[index].homeId = "";
+          this.form.resideInfoDtos[index].optionsV = [];
+          this.form.resideInfoDtos[index].optionsB = [];
+          this.form.resideInfoDtos[index].optionsD = [];
+          this.form.resideInfoDtos[index].optionsH = [];
+          this.getValiheList(index);
+        } else {
+          // this.selGridId = []
+          this.form.resideInfoDtos[index].gridId = "";
+          this.form.resideInfoDtos[index].agencyId = "";
+          this.$message.info("请选择网格");
+          return false;
+        }
+      }
+    },
+    handleChangeV(index) {
+      this.form.resideInfoDtos[index].buildId = "";
+      this.form.resideInfoDtos[index].unitId = "";
+      this.form.resideInfoDtos[index].homeId = "";
+      this.form.resideInfoDtos[index].optionsB = [];
+      this.form.resideInfoDtos[index].optionsD = [];
+      this.form.resideInfoDtos[index].optionsH = [];
+      this.getBuildList(index);
+      this.getUniList(index);
+      this.getHouseList(index);
+    },
+    handleChangeB(index) {
+      this.form.resideInfoDtos[index].unitId = "";
+      this.form.resideInfoDtos[index].homeId = "";
+      this.form.resideInfoDtos[index].optionsD = [];
+      this.form.resideInfoDtos[index].optionsH = [];
+      this.getUniList(index);
+      this.getHouseList(index);
+    },
+    handleChangeD(index) {
+      this.form.resideInfoDtos[index].homeId = "";
+      this.form.resideInfoDtos[index].optionsH = [];
+      this.getHouseList(index);
+    },
+    handleChangeH(i) {},
+    getValiheList(index) {
+      const { user } = this.$store.state;
+      this.$http
+        .post("/actual/base/communityQuarters/listQuartersOptions", {
+          gridId: this.form.resideInfoDtos[index].gridId,
+          agencyId: this.form.resideInfoDtos[index].agencyId || user.agencyId,
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            // this.form.resideInfoDtos[index].optionsV.push(...res.data)
+            this.$set(this.form.resideInfoDtos[index], "optionsV", 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.$set(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.$set(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.$set(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: [],
+        orgOptions: this.orgOption,
+      });
+    },
+    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];
+      }
+
+      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.baseInfoDto.categoryInfo.fertileWomanFlag = this.form.baseInfoDto.gender == 2 && (age >= 18 && age < 49)? 1 : 0;
+        let obj = {oldPeopleFlag:age >= 60 ? 1 : 0,fertileWomanFlag:this.form.baseInfoDto.gender == 2 && (age >= 18 && age < 49)? 1 : 0,sex,age}
+        this.$refs['stafftag'].updatedForm(obj);
+        this.form.oldPeopleDto.oldPeopleCategories = ['oldPeopleFlag'];
+        // 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.workInfoDto = {
+        careerStatus: val, //就业状况
+        workUnit: null, //工作单位
+        occupation: null, //职业
+        id: this.workInfoDtoId || null,
+      };
+      if (!this.workInfoDtoId) {
+        delete this.form.workInfoDto.id;
+      }
+    },
+    handlerCancle() {
+      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+        (item) => item.name !== "edit-elderly-database"
+      );
+      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["editForm"].validate((valid) => {
+        if (valid) {
+          this.form.resideInfoDtos.forEach((item) => {
+            delete item.optionsV;
+            delete item.optionsB;
+            delete item.optionsH;
+            delete item.optionsD;
+            delete item.orgOptions;
+          });
+          delete this.form.integrityData;
+          this.submitForm(house);
+        }
+      });
+    },
+    async submitForm(house) {
+      this.btnLoading = true;
+      try {
+        let url = this.houseType
+          ? "/actual/base/residentBaseInfo/update"
+          : "/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["editForm"].resetFields();
+            this.handlerCancle();
+          } else {
+            this.$message.success("保存成功");
+            let homeArr = JSON.parse(JSON.stringify(this.form.resideInfoDtos));
+            this.$refs["editForm"].resetFields();
+            this.form = this.formCopy;
+            this.form.resideInfoDtos = homeArr;
+            for (let key in this.form.baseInfoDto.categoryInfo) {
+              if (this.form.baseInfoDto.categoryInfo[key] === 1) {
+                this.form.baseInfoDto.categoryInfo[key] = 0;
+              }
+            }
+            this.$refs["resiExpand"].formList = [];
+            this.footerInputList.forEach((item) => {
+              item.children.forEach((child) => {
+                child.value = child.itemType === "checkbox" ? [] : null;
+              });
+            });
+            this.houseType = false;
+          }
+        } else if (code >= 8000) {
+          this.$message.error(msg);
+        }
+        this.btnLoading = false;
+      } catch (error) {
+        this.$message.error(msg);
+        this.btnLoading = false;
+      }
+    },
+
+    loadExpand({ index, value }, event,) {
+      // 设置 partyFlag
+      if (value === 1 || value === 0 || value === 2) {
+        this.form.baseInfoDto.categoryInfo.partyFlag = value;
+        value = value === 1 ? "parymemberInfoDto" : value;
+        if (value === 0 || value === 2) {
+          this.form.parymemberInfoDto = null;
+          this.footerInputList.forEach((item) => {
+            if (item.id === "parymemberInfoDto") {
+              item.children.forEach((child) => {
+                child.value = child.itemType === "checkbox" ? [] : null;
+              });
+            }
+          });
+
+          this.$nextTick(() => {
+            this.$refs["resiExpand"].formList = this.$refs[
+              "resiExpand"
+            ].formList.filter((item) => item.formId !== "parymemberInfoDto");
+          });
+        }
+      }
+
+      // 设置特殊处理逻辑
+      if (index !== 3 && index) {
+        this.form.baseInfoDto.categoryInfo[value] = event ? 1 : 0;
+      } else if (index === 3) {
+        if (event) {
+          this.form.baseInfoDto.categoryInfo.specialCrowdFlag = 1;
+          this.form.specialDto.specialCategoryCodes.push(value);
+        } else {
+          this.form.specialDto.specialCategoryCodes =
+            this.form.specialDto.specialCategoryCodes.filter(
+              (item) => item !== value
+            );
+        }
+      }
+      // 处理 incidence
+      if (this.incidence[value]) {
+        if (event) {
+          this.$nextTick(() => {
+            this.$refs["resiExpand"].formList.push({
+              form: [
+                this.footerInputList.find(
+                  (item) => item.id === this.incidence[value].formId
+                ),
+              ],
+              title: this.incidence[value].title,
+              formId: this.incidence[value].formId,
+            });
+            this.$refs["resiExpand"].formType = this.incidence[value].formType;
+            this.$refs["resiExpand"].showForm();
+          });
+        } else {
+          this.$refs["resiExpand"].formList = this.$refs[
+            "resiExpand"
+          ].formList.filter(
+            (item) => item.formId !== this.incidence[value].formId
+          );
+
+          this.footerInputList.forEach((item) => {
+            if (item.id === this.incidence[value].formId) {
+              item.children.forEach((child) => {
+                child.value = child.itemType === "checkbox" ? [] : null;
+              });
+            }
+          });
+          delete this.form[this.incidence[value].formType];
+        }
+      }
+    },
+    showDialog({ index, value }, event) {
+            if (value === 1) {
+                value = 'parymemberInfoDto'
+                this.form.baseInfoDto.categoryInfo.partyFlag = 1;
+            } else if (value === 0) {
+                value = 'parymemberInfoDto'
+                this.form.baseInfoDto.categoryInfo.partyFlag = 0;
+            } else if (value === 2) {
+                value = 'parymemberInfoDto'
+                this.form.baseInfoDto.categoryInfo.partyFlag = 2;
+            }
+            if (index != 3 && index) {
+                if(value === 'deathFlag'){
+                  this.form.baseInfoDto.deathFlag = event?1:0
+                }else{
+                  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: 'baseInfoDto', formType: 'baseInfoDto', 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: '志愿者' },
+                'unemployedFlag': { formId: 'unemployedDto', formType: 'unemployedDto', title: '失业人员' }
+            };
+      if (map[value] && event == true) {
+        this.dialogTitle = map[value].title;
+        this.dialogVisible = (event == true || value == "parymemberInfoDto") && this.dialogTitle != "";
+          this.$nextTick(() => {
+            this.$refs["addExpand"].formList = [
+              this.footerInputList.find((item) => item.id === map[value].formId),
+            ];
+            this.$refs["addExpand"].formType = map[value].formType;
+            this.$refs["addExpand"].showForm();
+          });
+      }else{
+        this.$refs["resiExpand"].formList = this.$refs[
+            "resiExpand"
+          ].formList.filter(
+            (item) => item.formId !== this.incidence[value].formId
+          );
+
+          this.footerInputList.forEach((item) => {
+            if (item.id === this.incidence[value].formId) {
+              item.children.forEach((child) => {
+                child.value = child.itemType === "checkbox" ? [] : null;
+              });
+            }
+          });
+          if(value === 'deathFlag'){
+                  this.form.baseInfoDto.deathFlag = 0;
+                  this.form.baseInfoDto.deathDate = null;
+          }else{
+                  delete this.form[this.incidence[value].formType];
+          }
+      }
+    },
+    submitExpandAdd(form, formType) {
+      if(formType === 'baseInfoDto' ){
+        this.form.baseInfoDto.deathDate = form[formType].deathDate;
+        this.form.baseInfoDto.deathFlag = 1;
+      }else{
+        this.form[formType] = form[formType];
+      }
+      this.dialogVisible = false;
+    },
+    hideExpand(formType) {
+      if(formType!= 'baseInfoDto'){
+        delete this.form[formType];
+      }else{
+        this.form['baseInfoDto'].deathFlag = 0;
+      }
+      this.dialogVisible = false;
+    },
+    // 提交扩展信息
+    submitExpand(_form, { changId, changPid, changType }) {
+      if (changType == "checkbox") {
+        this.form[changPid][changId] = [];
+        this.form[changPid][changId].push(..._form[changPid][changId]);
+      } else {
+        if (!this.form[changPid]) {
+          this.$set(this.form, changPid, {});
+        }
+        if (changPid) {
+          this.$set(this.form[changPid], changId, _form[changPid][changId]);
+        }
+      }
+      for (let i in this.footerInputList) {
+        if (this.footerInputList[i].id === changPid) {
+          for (let index in this.footerInputList[i].children) {
+            const formName = this.footerInputList[i].children[index].formName;
+            const formData = this.form[changPid];
+            if (formData && Object.keys(formData).includes(formName)) {
+              this.footerInputList[i].children[index].value =
+                formData[formName] || null;
+            }
+          }
+        }
+      }
+    },
+  },
+  components: { stafftag, resiExpand ,addExpand},
+  computed: {},
+  watch: {},
+};
+</script>
+
+<style lang='scss' scoped>
+@import "@/assets/scss/modules/management/form-main.scss";
+@import "@/assets/scss/pages/resiAdd.scss";
+</style>
diff --git a/src/views/modules/hengAnXin/elderlyDatabase/index.vue b/src/views/modules/hengAnXin/elderlyDatabase/index.vue
index e61e86643..22e58bfe1 100644
--- a/src/views/modules/hengAnXin/elderlyDatabase/index.vue
+++ b/src/views/modules/hengAnXin/elderlyDatabase/index.vue
@@ -1,218 +1,383 @@
 <template>
+  <!-- 重点人员 -->
   <div class="g-main">
-    <!-- 重点类别 -->
-    <div class="m-search">
-      <el-form :inline="true" :model="queryParams" ref="ref_searchform" :label-width="'100px'">
-        <div>
-          <el-form-item label="类别名称" prop="title">
-            <el-input v-model.trim="queryParams.title" size="small" class="item_width_1" clearable placeholder="请输入">
+    <section style="width: 100%">
+      <div class="m-search">
+        <el-form ref="queryForm" class="header_form_box" :model="queryParams" :label-width="'80px'">
+          <el-form-item label="所属组织" prop="agencyId">
+            <el-cascader style="width: 100%;" size="small" v-model="cascaderAgencyId" :options="organizeOptions"
+              :props="{ checkStrictly: true, multiple: false, value: 'value', label: 'label', children: 'children' }"
+              :show-all-levels="false" @change="handleOrgChange" clearable></el-cascader>
+          </el-form-item>
+          <el-form-item label="姓名" prop="name">
+            <el-input v-model.trim="queryParams.name" placeholder="请输入" clearable size="small">
             </el-input>
           </el-form-item>
-        </div>
+          <el-form-item label="手机号" prop="mobile">
+            <el-input v-model.trim="queryParams.mobile" placeholder="请输入" clearable size="small">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="证件类型">
+            <el-select v-model.trim="queryParams.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-form-item label="证件号" prop="idNum">
+            <el-input v-model.trim="queryParams.idNum" class="u-item-width-daterange" placeholder="请输入" clearable
+              size="small">
+            </el-input>
+          </el-form-item> -->
+
+          <el-form-item label="年龄区间">
+            <div style="display: flex; align-items: center;">
+              <el-input v-model.trim="queryParams.ageStart" @change="handleAgeChange" class="u-item-width-daterange"
+                placeholder="请输入" clearable size="small">
+              </el-input>
+              <span style="margin: 0 5px;">至</span>
+              <el-input v-model.trim="queryParams.ageEnd" @change="handleAgeChange"
+                class="u-item-width-daterange u-data-tag" placeholder="请输入" clearable size="small">
+              </el-input>
+            </div>
+          </el-form-item>
+        </el-form>
+
         <div>
           <div style="display: flex; justify-content: flex-end;">
             <el-button style="margin-left:10px" class="diy-button--blue" size="small"
-              @click="handleSearch">查询</el-button>
+              @click="handleSearchFrom">查询</el-button>
             <el-button style="margin-left:10px" class="diy-button--white" size="small"
-              @click="resetSearch">重置</el-button>
+              @click="resetSearchForm">重置</el-button>
           </div>
         </div>
-      </el-form>
-    </div>
-    <div class="m-table">
-      <div class="div_btn">
-        <el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
       </div>
+      <div class="m-table">
+        <div class="div_btn">
+          <el-button class="diy-button--add" v-if="btnAuths.ic_keyPersonnel_add" size="small" @click="handleAdd"
+            type="primary" icon="el-icon-plus">新增</el-button>
+          <!-- <el-button v-if="btnAuths.ic_resi_export" style="margin-left: 10px" size="small" class="diy-button--white"
+              @click="diyExport" :loading="exportLoading" plain>{{ exportBtnTitle }}</el-button>
+            <el-button style="margin-left: 10px" v-if="btnAuths.ic_resi_batch_del" size="small" class="diy-button--add"
+              type="primary" @click="deleteBatch">批量删除</el-button> -->
+        </div>
+        <el-table class="table" :data="tableData" border :height="tableHeight" v-loading="tableLoading"
+          style="width: 100%;margin-top:16px">
+          <!-- <el-table-column type="selection" fixed="left" align="center" width="50" /> -->
+          <el-table-column label="序号" type="index" fixed="left" align="left" width="50">
+          </el-table-column>
+          <el-table-column label="所属组织" prop="agencyName" align="center">
+          </el-table-column>
+          <el-table-column label="重点人员类型" prop="gridName" align="center">
+          </el-table-column>
+          <el-table-column label="姓名" prop="name" align="center">
+          </el-table-column>
+          <el-table-column label="手机号" prop="mobile" align="center">
+          </el-table-column>
+          <el-table-column label="证件类型" prop="idTypeName" align="center">
+          </el-table-column>
+          <el-table-column label="证件号" prop="idNum" align="center">
+          </el-table-column>
+          <el-table-column label="住址" prop="homeName" align="center" show-overflow-tooltip>
+          </el-table-column>
 
-      <el-table class="table" :data="tableData" border :height="tableHeight" v-loading="tableLoading"
-        style="width: 100%;margin-top:16px">
-
-        <el-table-column label="序号" header-align="center" align="center" type="index" width="50" />
-        <el-table-column prop="importantName" header-align="center" align="center" label="类型名称" />
-        <el-table-column prop="categoryCodeList" header-align="center" align="center" label="居民分类" show-overflow-tooltip :formatter="formatterCategory" />
-        <el-table-column label="操作" fixed="right" header-align="center" align="center" width="160" class="operate">
-          <template slot-scope="scope">
-
-            <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleDetail(scope.row)">查看</el-button>
-
-            <el-button type="text" style="color:#1C6AFD;" size="small"
-              @click="handleEdit(scope.row)">编辑</el-button>
-
-            <el-button type="text" style="color:#1C6AFD;" size="small"
-              @click="handleDelete(scope.row)">删除</el-button>
-
-          </template>
-        </el-table-column>
-      </el-table>
-      <div>
-        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo"
-          :page-sizes="[10, 20, 50]" :page-size="pageSize" layout="sizes, prev, pager, next, total" :total="total">
-        </el-pagination>
+          <el-table-column fixed="right" label="操作" align="center" width="200">
+            <template slot-scope="scope">
+              <el-button v-if="btnAuths.ic_keyPersonnel_detail" type="text" size="small"
+                @click="handleLook(scope.row)">查看</el-button>
+              <el-button v-if="btnAuths.ic_keyPersonnel_edit" style="margin-right: 10px"
+                @click="handelCLickShowCheckPassword(scope.row)" size="small" type="text">编辑</el-button>
+              <el-popconfirm v-if="btnAuths.ic_keyPersonnel_delete" title="删除之后无法回复，确认删除？"
+                @onConfirm="handleDel(scope.row)">
+                <el-button size="small" type="text" slot="reference">删除</el-button>
+              </el-popconfirm>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="div-flex">
+          <div class="m-page">
+            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+              :current-page.sync="pageNo" :page-sizes="[20, 50, 100, 200]" :page-size="pageSize"
+              layout="sizes, prev, pager, next, total" :total="total">
+            </el-pagination>
+          </div>
+        </div>
       </div>
-    </div>
-
-    <!-- 新增 || 修改 || 查看弹出框 -->
-    <key-category-dialog ref="keyCategoryDialog" :visible.sync="dialogVisible" :title="dialogTitle"
-      @success="getTableData"></key-category-dialog>
-
+    </section>
 
+    <!--  密码验证 -->
+    <check-password :visible.sync="showCheckPassword" ref="checkPassword" @success="saveCheckPassword"></check-password>
   </div>
 </template>
-
 <script>
-import { mapGetters } from 'vuex';
+import _ from "lodash";
+import { mapGetters } from "vuex";
 import { requestPost, requestGet } from "@/js/dai/request";
-import { categoryAllList } from '@/utils/enum.js';
-import keyCategoryDialog from './components/keyCategoryDialog.vue';
-
+import checkPassword from "./components/checkPassword.vue";
+import { idTypeList } from "@/js/columns/constants";
+let loading;
 export default {
-  name: 'keyCategoryIndex',
+  name: "keyPersonnelIndex",
   components: {
-    keyCategoryDialog,
+    checkPassword,
   },
   data() {
     return {
-      loading: false,
-      total: 0,
-      pageSize: 10,
-      pageNo: 1,
-      tableLoading: false,
-      agencyId: '',
-      typeList: [],
-      categoryAllList: _.cloneDeep(categoryAllList),
       queryParams: {
-        // title: "",
+        agencyId: '',
+        name: '',
+        mobile: '',
+        idType: '',
+        ageStart: '',
+        ageEnd: '',
+        attentionCrowds: ["OLD_PEOPLE_FLAG"],
+        pageNo: 1,
+        pageSize: 10
       },
       tableData: [],
-      dialogVisible: false,
-      dialogTitle: '',
-    }
+      cascaderAgencyId: [],
+      idTypeList,
+      pageSize: 20,
+      pageNo: 1,
+      total: 0,
+      organizeOptions: [],
+      btnAuths: {
+        ic_keyPersonnel_add: true,
+        ic_keyPersonnel_edit: true,
+        ic_keyPersonnel_detail: true,
+        ic_keyPersonnel_delete: true
+      },
+      showCheckPassword: false,
+      exportLoading: false,
+      exportBtnTitle: "导出",
+      importBtnTitle: "导入",
+      tableLoading: false,
+      // 显示人员详情
+      lookResiId: "",
+      selection: [],
+      editUserId: "",
+    };
+  },
+  props: {},
+  computed: {
+    ...mapGetters(["clientHeight"]),
+    tableHeight() {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 450 + this.iframeHeigh
+        : this.clientHeight - 450;
+    },
   },
-  mounted() {
-    this.getTableData()
+  created() {
+    this.getOptions();
+  },
+  async mounted() {
+    this.getTableData();
   },
-
   methods: {
-
-    // 获取列表
-    async getTableData() {
-      const url = "/actual/base/residentCategoryImportant/page";
-      let params = {
-        pageSize: this.pageSize,
-        pageNo: this.pageNo,
-        ...this.queryParams,
+    // 获取所属组织
+    async getOptions() {
+      const { data } = await requestPost("/gov/org/customeragency/orgtree", {});
+      this.organizeOptions = data ? [this.computeOption(data)] : []
+    },
+    // 格式化数据
+    computeOption(opt) {
+      return {
+        label: opt.agencyName,
+        value: opt.agencyId,
+        type: "agency",
+        children: [
+          ...this.processDepartmentList(opt.departmentList),
+          ...this.processGridList(opt.gridList),
+          ...this.processSubAgencyList(opt.subAgencyList),
+        ],
       };
-      let { data, code, msg } = await requestPost(url, params);
+    },
+    // 处理部门列表
+    processDepartmentList(departmentList) {
+      return (departmentList || []).map((item) => ({
+        label: item.deptName,
+        value: item.deptId,
+        type: "dept",
+        typeName: "部门",
+      }))
+    },
+    // 处理网格列表
+    processGridList(gridList) {
+      return (gridList || []).map((item) => ({
+        label: item.gridName,
+        value: item.gridId,
+        type: "grid",
+        typeName: "网格",
+      }))
+    },
+    // 处理子机构列表
+    processSubAgencyList(subAgencyList) {
+      return (subAgencyList || []).map((item) => this.computeOption(item))
+    },
+    handleAgeChange() {
+      if (this.queryParams.ageStart && this.queryParams.ageEnd) {
+        if (Number(this.queryParams.ageStart) > Number(this.queryParams.ageEnd)) {
+          this.$message.warning('结束年龄不能小于开始年龄')
+        }
+      }
+    },
+    // 获取列表数据
+    async getTableData() {
+      this.tableLoading = true;
+      const { data, code, internalMsg } = await requestPost("/actual/base/residentBaseInfo/page", this.queryParams);
+      console.log('data=====', data)
+      this.tableLoading = false;
       if (code === 0) {
-        console.log('data===', data)
-        this.total = data.total
-        this.tableData = data.list
+        this.total = data.total;
+        this.tableData = data.list;
       } else {
-        this.$message.error(msg)
+        this.$message.error(internalMsg);
       }
     },
 
-    // 搜索
-    handleSearch() {
-       this.pageNo = 1;
-       this.getTableData();
+    // 修改组织级联选择器值
+    handleOrgChange(val) {
+      this.queryParams.agencyId = val[val.length - 1];
     },
 
-    // 重置
-    resetSearch() {
-      this.queryParams = {};
-      this.pageSize = 10;
+    // 搜索
+    handleSearchFrom() {
       this.pageNo = 1;
       this.getTableData();
     },
-
+    resetSearchForm() {
+      this.cascaderAgencyId = [];
+      this.$refs.queryForm.resetFields();
+      this.queryParams.ageStart = '';
+      this.queryParams.ageEnd = '';
+    },
     handleSizeChange(val) {
       this.pageSize = val;
-      this.pageNo = 1;
       this.getTableData();
     },
     handleCurrentChange(val) {
+      console.log(val);
       this.pageNo = val;
       this.getTableData();
     },
 
-    // 新增
-    handleAdd() {
-      this.dialogVisible = true;
-      this.dialogTitle = '新增';
-      this.$nextTick(() => {
-        this.$refs.keyCategoryDialog.initForm();
+    // 查看
+    async handleLook(row) {
+      this.lookResiId = row.resiId;
+      let {
+        agencyId,
+        gridId,
+        gridName,
+        gender,
+        homeId,
+        homeName,
+        name,
+        resiId,
+      } = row;
+      this.$store.dispatch("saveData", {
+        agencyId,
+        gridId,
+        gridName,
+        gender,
+        homeId,
+        homeName,
+        name,
+        resiId,
       });
+      this.$router.push({ name: "jumin-huaxiang" });
+      this.$store.state.contentTabs = this.$store.state.contentTabs.map(
+        (item) => {
+          if (item.name === "jumin-huaxiang") {
+            return { ...item, title: name };
+          }
+          return item;
+        }
+      );
     },
-    // 编辑
-    handleEdit(row) {
-      this.dialogVisible = true;
-      this.dialogTitle = '编辑';
-      this.$nextTick(() => {
-        this.$refs.keyCategoryDialog.initForm(row);
-      });
+    async handelCLickShowCheckPassword(row) {
+      const url = `/actual/base/residentCategoryUpdateInfo/isUpdater/${row.resiId}`;
+      const { data, code, msg } = await requestPost(url);
+      console.log(data);
+      console.log(code);
+      if (code == 0) {
+        if (data == true) {
+          this.editUserId = row.resiId;
+          this.saveCheckPassword()
+        }
+        else {
+          this.editUserId = row.resiId;
+          this.showCheckPassword = true;
+        }
+      }
+      else {
+        this.$message.error(msg);
+      }
     },
-    // 查看
-    handleDetail(row) {
-      this.dialogVisible = true;
-      this.dialogTitle = '查看';
-      this.$nextTick(() => {
-        this.$refs.keyCategoryDialog.initForm(row);
-      });
+    async saveCheckPassword(password) {
+      const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.editUserId}`;
+      let parm = {
+        password,
+      };
+      const { data, code, msg } = await requestPost(url, parm);
+      console.log(data, code, msg);
+      if (code === 0) {
+        this.showCheckPassword = false;
+        this.$router.push({
+          name: "edit-elderly-database",
+          query: { id: this.editUserId },
+          params: { idNum: data.idNum, mobile: data.mobile, name: data.name, nationality: data.nationality },
+        });
+      } else {
+        this.$message.error(msg);
+      }
     },
-    // 删除
-    async handleDelete(row) {
-      this.$confirm("确认删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(async () => {
-          const url = "/actual/base/residentCategoryImportant/delete"
-          let obj = {
-            id: row.id
-          }
-          const { data, code, internalMsg } = await requestGet(url, obj)
-          if (code === 0) {
-            this.$message({
-              type: "success",
-              message: "删除成功"
-            });
-            this.getTableData()
+    handleAdd() {
+      this.$router.push({ name: "add-elderly-database" });
+    },
+    handleDel(row) {
+      this.$http
+        .post("/actual/base/residentBaseInfo/batchdel", [row.resiId])
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
           } else {
-            this.$message.error(internalMsg)
+            this.$message.success("删除成功");
+            this.getTableData();
           }
         })
-        .catch(err => {
-
+        .catch((err) => {
+          return this.$message.error("网络错误");
         });
     },
-
-    // 格式化类别
-    formatterCategory(row) {
-      if (row.categoryCodeList) {
-        const labels = row.categoryCodeList.map(item => {
-          const matchedItem = this.categoryAllList.find(cat => cat.value.toUpperCase() === item.toUpperCase());
-          console.log('matchedItem--', matchedItem)
-          return matchedItem.label;
-        }).filter(label => label);
-        return labels.join(",");
+    startLoading() {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
+    },
+    endLoading() {
+      if (loading) {
+        loading.close();
       }
-    }
-  },
-
-  computed: {
-    tableHeight() {
-      return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430
     },
-    ...mapGetters(['clientHeight', 'iframeHeight'])
-  }
-}
+  },
+};
 </script>
-
 <style lang="scss" scoped>
-.g-main {
-  width: 100%;
+// @import "@/assets/scss/modules/management/list-main.scss";
+
+.header_form_box {
+  display: flex;
+  flex-wrap: wrap;
+
+  .el-form-item {
+    width: 20%;
+
+    .el-input {
+      width: 100%;
+    }
+  }
 }
 
 .m-search {
@@ -232,4 +397,72 @@ export default {
   margin: 16px 7px 7px;
 
 }
-</style>
\ No newline at end of file
+
+
+::v-deep .el-button--primary.is-plain {
+  color: #0055d7;
+  background: #ffffff;
+  border-color: #0055d7;
+}
+
+
+
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
+  }
+
+  ::v-deep .btn-color-del {
+    margin-left: 10px;
+    color: rgba(213, 16, 16, 1);
+  }
+
+  ::v-deep .btn-color-edit {
+    color: rgba(0, 167, 169, 1);
+  }
+}
+
+
+.resi-down {
+  position: absolute;
+  left: 50%;
+  bottom: -10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 46px;
+  height: 12px;
+  box-sizing: border-box;
+  margin-left: -23rpx;
+  cursor: pointer;
+  background: #ffffff;
+  border-radius: 0 0 10px 10px;
+
+  img {
+    display: block;
+  }
+}
+
+
+.div-flex {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+
+  .div_del {
+    margin-top: 15px;
+  }
+
+  .m-page {
+    margin-left: auto;
+  }
+}
+
+.resiCategoryInfoBox {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  word-wrap: normal;
+}
+</style>