居民详情小问题修改

src/assets/scss/pages/resiInfo.scss

@@ -58,10 +58,17 @@
                     padding-left: 16px;
                     cursor: pointer;
                     line-height: 38px;
+                    .full{
+                        color: #0056d6;
+                    }
+                    .incomplete{
+                        color: #ff5107;
                     }
+               } 
+              
                .active{
                     background: #F7FAFF;
-                    color: #0056D6;
+                    color: #0056D6 !important;
                     position: relative;
                     &::after{
                         content: '';
@@ -99,10 +106,12 @@
         .f-label {
             width: 100px;
             text-align: right;
+            color: rgba(51, 51, 51, .85) ;
             >b{
                 font-weight: 400;
                 position: relative;
-                color:#ff5107;
+                color: rgba(51, 51, 51, .85) ;
+
                 &::after{
                     content: '*';
                     position: absolute;
@@ -124,12 +133,7 @@
         }
     }
 }
-.full{
+
-    color: #0056d6;
-}
-.incomplete{
-    color: #ff5107;
-}
 ::v-deep .el-button--text{
     padding: 0;
 }

src/views/components/addResi.vue

@@ -606,8 +606,8 @@ export default {
                     children: [
                         {
                             label: "所患大病",
-                            itemType: "select1",
+                            itemType: "checkbox",
-                            formName: "illnessCode",
+                            formName: "illnessCodes",
                             opctionUrl: 'sys/dict/data/dictlist',
                             opctionParams: { dictType: 'illness_code' },
                             opction: []
@@ -619,7 +619,7 @@ export default {
                         {
                             label: "所患慢病",
                             itemType: "checkbox",
-                            formName: "chronicDiseaseCode",
+                            formName: "chronicDiseaseCodes",
                             opctionUrl: 'sys/dict/data/dictlist',
                             opctionParams: { dictType: 'chronic_disease_code' },
                             opction: []

src/views/components/resiExpand/index.vue

@@ -115,11 +115,11 @@ export default {
                 },
                 // 大病信息
                 seriousIllnessDto: {
-                    illnessCode: null
+                    illnessCodes: []
                 },
                 // 慢病信息
                 chronicDiseaseDto: {
-                    chronicDiseaseCode: []
+                    chronicDiseaseCodes: []
                 },
                 // 死亡信息
                 deathDto: {
@@ -147,9 +147,10 @@ export default {
                     employmentSituation: null,
                     pubWelfareJobFlag: null
                 },
+                
                 // 保障房人员
                 ensureHouseDto: {
-                    community: null,
+                    liveCommunity: null,
                     housingNature: null
                 },
                 // 统战人员

src/views/components/resiForm.vue

@@ -1042,7 +1042,7 @@ export default {
             },
             {
               label: "通知书领取日期",
-              itemType: "datepicker1",//我在父组件中调用子组件,当我在父组件切换到其他子组件时,子组件的值会丢失,需要保存起来
+              itemType: "datepicker1",
               formName: "notificationRcvDate",
               opction: []
             },

src/views/modules/base/resi.vue

@@ -70,7 +70,8 @@
                             {{ handleFilterSpan(scope.row, item) }}
                         </a>
                         <div v-else-if="item.columnName == 'gender'">
-                            {{ scope.row.gender == null ? '--' : scope.row.gender == 1 ? '男' : scope.row.gender == 2 ? '女' : '--' }}
+                            {{ scope.row.gender == null ? '--' : scope.row.gender == 1 ? '男' : scope.row.gender == 2 ? '女' :
+                                '--' }}
                         </div>
                         <div v-else-if="item.columnName == 'birthday'">
                             {{
@@ -240,7 +241,7 @@
 
                         <template v-if="filterEdit(scope.row.agencyId)">
                             <el-button v-if="btnAuths.ic_resi_update" style="margin-right: 10px"
-                                @click="handleEdit(scope.row)" size="small" type="text">编辑</el-button>
+                                @click="handelCLickShowCheckPassword(scope.row)" size="small" type="text">编辑</el-button>
 
                             <el-popconfirm v-if="btnAuths.ic_resi_del" title="删除之后无法回复，确认删除？"
                                 @onConfirm="handleDel(scope.row)">
@@ -331,6 +332,17 @@
             width="620px" top="5vh" class="dialog-h" @closed="diaClose">
             <resideath-add ref="ref_death" @dialogCancle="deathClose"></resideath-add>
         </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="checkPasswordFrom.password" autocomplete="off" type="password" placeholder="请输入当前账号密码"></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>
 
@@ -379,6 +391,16 @@ export default {
             isIndeterminate: false,
             dialogEditVisible: false,
             dialogVisible: false,
+            showCheckPassword: false,
+            checkPasswordFrom: {
+                password: ''
+            },
+            checkPasswordRulse: {
+                password: [
+                    { required: true, message: '请输入密码', trigger: 'blur' },
+                    { min: 6, max: 18, message: '长度在 6 到 18 个字符', trigger: 'blur' }
+                ]
+            },
             formType: 'add',
             // 显示人员详情
             dialogVisible2: false,
@@ -875,30 +897,71 @@ export default {
                 return item;
             });
         },
-
+        handelCLickShowCheckPassword(row) {
-        // 编辑
-        async handleEdit(row) {
             this.editUserId = row.resiId;
+            this.showCheckPassword = true;
+        },
+        handelClickCheckPassword() {
+            this.$refs.checkPasswordFrom.validate(async vali => {
+                if (vali) {
+                    const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.checkPasswordFrom.password}`;
+                    let parm = {
+                        password
+                    }
+                    const { data, code, msg } = await requestPost(url, parm);
+                    if (code === 0) {
                         this.formName = "编辑居民";
                         this.formType = 'edit'
                         this.dialogVisible = true;
-            await this.residentBaseInfo();
+                        this.$refs.baseForm.old_from(data);
-        },
+                        this.showCheckPassword = false
-        // 获取详情
-        residentBaseInfo() {
-            this.$http
-                .post(`/actual/base/residentBaseInfo/detail/clear/${this.editUserId}`)
-                .then(({ data: res }) => {
-                    if (res.code !== 0) {
-                        return this.$message.error(res.msg);
                     } else {
-                        this.$refs.baseForm.old_from(res.data);
+                        this.$message.error(msg);
+                    }
+                } else {
+                    return false
                 }
             })
-                .catch((err) => {
-                    return this.$message.error("网络错误");
-                });
         },
+        // async handleSaveTuomin(password) {
+        //     const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.editUserId}`;
+        //     let parm = {
+        //         password
+        //     }
+        //     const { data, code, msg } = await requestPost(url, parm);
+        //     if (code === 0) {
+        //         this.formName = "编辑居民";
+        //         this.formType = 'edit'
+        //         this.dialogVisible = true;
+        //         this.$refs.baseForm.old_from(data);
+        //         this.showCheckPassword = false
+        //     } else {
+        //         this.$message.error(msg);
+        //     }
+        // },
+        // 编辑
+        // async handleEdit(row) {
+        //     this.editUserId = row.resiId;
+        //     this.formName = "编辑居民";
+        //     this.formType = 'edit'
+        //     this.dialogVisible = true;
+        //     await this.residentBaseInfo();
+        // },
+        // 获取详情
+        // residentBaseInfo() {
+        //     this.$http
+        //         .post(`/actual/base/residentBaseInfo/detail/clear/${this.editUserId}`)
+        //         .then(({ data: res }) => {
+        //             if (res.code !== 0) {
+        //                 return this.$message.error(res.msg);
+        //             } else {
+        //                 this.$refs.baseForm.old_from(res.data);
+        //             }
+        //         })
+        //         .catch((err) => {
+        //             return this.$message.error("网络错误");
+        //         });
+        // },
         handlerReset() {
             this.$refs.baseForm.resetForm();
         },

src/views/modules/communityParty/elegant/detail.vue

@@ -72,7 +72,6 @@ export default {
   watch: {},
 
   async mounted () {
-    console.log('mounted-----我执行了')
 
   },
 

src/views/modules/portrayal/jumin/cpts/graph.vue

@@ -52,7 +52,6 @@ export default {
     watch: {
         userInfo: {
             handler(newVal, oldVal) {
-                console.log(newVal.resiId);
                 this.getFamilyRelationshipList()
             },
             deep: true
@@ -73,9 +72,9 @@ export default {
                 let familyList = data.map((item, index) => ({
                     'id': `N${index + 1}`,
                     'text': item.name,
-                    'innerHTML': `<div class="c-my-node${index == 0 ? '1' : '2'}  c-my-node-${index == 0 ? item.gender == 1 ? 'father' : 'mother' : item.houseHolderRel == '配偶' ? item.gender == '1' ? 'mother' : 'father' : item.houseHolderRel == '女儿' ? 'girl' : item.houseHolderRel == '儿子' ? 'gon' : item.houseHolderRel == '父亲' || item.houseHolderRel == '祖父母' ? item.gender == 1 ? 'grandpa' : 'grandma' : item.houseHolderRel == '母亲' ? 'grandma' : 'father'}"><div class="c-node-name${index == 0 ? '1' : '2'}" style="color:#000">${item.name.length === 2 ?
+                    'innerHTML': `<div class="c-my-node${index == 0 ? '1' : '2'}  c-my-node-${item.type == 1?'home':index == 0 ? item.gender == 1 ? 'father' : 'mother' : item.houseHolderRel == '配偶' ? item.gender == '1' ? 'mother' : 'father' : item.houseHolderRel == '女儿' ? 'girl' : item.houseHolderRel == '儿子' ? 'gon' : item.houseHolderRel == '父亲' || item.houseHolderRel == '祖父母' ? item.gender == 1 ? 'grandpa' : 'grandma' : item.houseHolderRel == '母亲' ? 'grandma' : 'father'}"><div class="c-node-name${index == 0 ? '1' : '2'}" style="color:#000">${item.type == 1?`${item.name}`:item.name.length === 2 ?
                         item.name.substring(0, 1) + '*' :
-                        item.name.substring(0, 1) + '*' + item.name.substring(2)} （${item.age}）岁</div></div>`
+                        item.name.substring(0, 1) + '*' + item.name.substring(2)} ${item.age?`（${item.age}）岁`:''}</div></div>`
                 }))
                 let lineList = data.map((item, index) => ({
                     'from': 'N1',

src/views/modules/portrayal/jumin/cpts/staffTag.vue

@@ -17,8 +17,9 @@
                         </el-form-item>
                         <el-form-item :prop="'tableData.' + scope.$index + '.value'" v-if="scope.row.type == 'checkbox'">
                             <el-checkbox-group v-model="scope.row.value">
-                                <el-checkbox @change="handeleClickchckbox(item,$event,scope.$index )" :disabled="formType == 'detail'"
+                                <el-checkbox @change="handeleClickchckbox(item, $event, scope.$index)"
-                                    v-for="(item, index) in scope.row.option" :key="index" :label="item.value">{{ item.label
+                                    :disabled="formType == 'detail'" v-for="(item, index) in scope.row.option" :key="index"
+                                    :label="item.value">{{ item.label
                                     }}</el-checkbox>
                             </el-checkbox-group>
                         </el-form-item>
@@ -197,24 +198,21 @@ export default {
     },
     methods: {
         updatedForm() {
-            if (!this.userInfo.categoryInfo) return;
+            console.log(this.userInfo.baseInfoDto.categoryInfo);
+            if (!this.userInfo.baseInfoDto.categoryInfo) return;
             const updateValue = (flag, dataIndex) => {
                 const { tableData } = this.formData;
                 const valueArray = tableData[dataIndex].value;
-
+                if (this.userInfo.baseInfoDto.categoryInfo[flag] === 1) {
-                if (this.userInfo.categoryInfo[flag] === 1) {
                     valueArray.push(flag);
                 } else {
                     this.formData.tableData[dataIndex].value = valueArray.filter(item => item !== flag);
                 }
             };
-
+            if(this.userInfo.baseInfoDto.categoryInfo.specialCrowdFlag == 1){
-            // 更新 partyFlag
+                this.formData.tableData[3].value.push(...this.userInfo.specialDto.specialCategoryCodes);
-            if (this.userInfo.categoryInfo.partyFlag === 1) {
-                this.formData.tableData[0].value = '2';
-            } else if (this.userInfo.categoryInfo.partyFlag === 0) {
-                this.formData.tableData[0].value = '1';
             }
+            this.formData.tableData[0].value = this.userInfo.baseInfoDto.categoryInfo.partyFlag;
             //添加回填需要在这里加上key与对应的index(在formData.tableData中对应的下标)
             updateValue('disabilityFlag', 1);
             updateValue('seriousIllnessFlag', 1);
@@ -245,9 +243,18 @@ export default {
     watch: {
         userInfo: {
             handler(newVal, oldVal) {
+                this.formData.tableData.forEach((item, index) =>{
+                    if(index!=0){
+                        item.value = []
+                    }else{
+                        item.value = ''
+                    }
+                })
                 this.updatedForm()
             },
-            deep: true
+            deep: true,
+            immediate: true 
+
         }
     },
 }

src/views/modules/portrayal/jumin/index.vue

@@ -9,16 +9,17 @@
             </div>
             <div class="menu">
                 <div class="progress">
-                    <div class="text"><span>信息完整度</span> <span>70</span> </div>
+                    <div class="text"><span>信息完整度</span> <span>{{ score }}</span> </div>
                     <el-progress :percentage="70" :show-text="false"></el-progress>
                 </div>
 
                 <div class="list">
                     <div :class="{ 'item': true, 'active': index == active }" v-for="(item, index) in menuList"
-                        @click="handelCLickMenu(index)">
+                        @click="handelCLickMenu(item.id, index)" v-show="item.filledQty != 0">
                         <span>{{ item.name }}</span><span
-                            :class="{ 'incomplete': index == '2' || index == '3', 'full': index != '2' && index != '3' }">{{
+                            :class="{ 'incomplete': item.filledQty != item.totalQty && index != active, 'full': item.filledQty == item.totalQty }">（{{
-                                item.num }}</span>
+                                item.filledQty }}/{{
+        item.totalQty }}）</span>
                     </div>
                 </div>
             </div>
@@ -118,14 +119,14 @@
                 <el-col :span="6" class="f-flex">
                     <div class="f-label">备注：</div>
                     <div class="f-left8 f-font-color">
-                        {{ resiDetailObj.baseInfoDt && resiDetailObj.baseInfoDto.remark ? resiDetailObj.baseInfoDto.remark :
+                        {{ resiDetailObj.baseInfoDto.remark ? resiDetailObj.baseInfoDto.remark :
                             "--" }}
                     </div>
                 </el-col>
                 <el-col :span="6" class="f-flex">
                     <div class="f-label">创建日期：</div>
                     <span class="f-left8 f-font-color">
-                        {{ resiDetailObj.baseInfoDt && resiDetailObj.baseInfoDto.createdTime ?
+                        {{ resiDetailObj.baseInfoDto.createdTime ?
                             resiDetailObj.baseInfoDto.createdTime : "--" }}</span>
                 </el-col>
             </el-row>
@@ -134,46 +135,59 @@
                     <div class="f-flex ">
                         <div class="f-label">更新时间：</div>
                         <span class="f-left8 f-font-color">
-                            {{ resiDetailObj.baseInfoDt && resiDetailObj.baseInfoDto.updatedTime ?
+                            {{ resiDetailObj.baseInfoDto.updatedTime ?
                                 resiDetailObj.baseInfoDto.updatedTime : "--" }}</span>
                     </div>
                 </el-col>
             </el-row>
             <div class="title-small">居住信息</div>
-            <!-- <el-row type="flex" justify="" class="f-m-top23">
+            <section v-for="(item, indexK) in resiDetailObj.resideInfoDtos" :key="indexK">
-                <el-col :span="24" class="f-flex">
+                <el-row type="flex" justify="" class="f-m-top23">
+                    <el-col :span="12" class="f-flex">
+                        <div class="f-flex ">
+                            <div class="f-label"><b>所属网格：</b></div>
+                            <span class="f-left8 f-font-color">
+                                {{ item.gridName || '--' }}
+                            </span>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="f-flex">
                         <div class="f-flex ">
                             <div class="f-label"><b>所属房屋：</b></div>
                             <span class="f-left8 f-font-color">
-                            {{ resiDetailObj.houseInfo.gridName + '-' + resiDetailObj.houseInfo.homeName || '--' }}
+                                {{ item.gridName + '-' + item.homeName || '--' }}
                             </span>
                         </div>
                     </el-col>
-            </el-row> -->
+                </el-row>
                 <el-row type="flex" justify="" class="f-m-top23">
                     <el-col :span="6" class="f-flex">
                         <div class="f-flex ">
                             <div class="f-label"><b>人房关系：</b></div>
-                        <span class="f-left8 f-font-color">--</span>
+                            <span class="f-left8 f-font-color">
+                                {{ item.resiHouseRel != null ? item.resiHouseRel === 0 ? '自住' : item.resiHouseRel ===
+                                    1 ? '租住' : '--' : '--' }}
+                            </span>
                         </div>
                     </el-col>
                     <el-col :span="6" class="f-flex">
                         <div class="f-flex ">
                             <div class="f-label"><b>人户状况：</b></div>
-                        <span class="f-left8 f-font-color">--</span>
+                            <span class="f-left8 f-font-color">{{ householdSituationText(indexK) }}</span>
                         </div>
                     </el-col>
                     <el-col :span="6" class="f-flex">
                         <div class="f-label"><b>户籍所在地：</b></div>
                         <div class="f-left8 f-font-color">
-                        --
+                            {{ item.placeOfDomicile || '--' }}
                         </div>
                     </el-col>
                     <el-col :span="6" class="f-flex">
                         <div class="f-label"><b>与户主关系：</b></div>
-                    <span class="f-left8 f-font-color">--</span>
+                        <span class="f-left8 f-font-color">{{ houseHolderRelText(indexK) }}</span>
                     </el-col>
                 </el-row>
+            </section>
 
             <div class="title-small">拓展信息</div>
             <el-row type="flex" justify="" class="f-m-top23">
@@ -205,7 +219,7 @@
                     </div>
                 </el-col>
                 <el-col :span="6" class="f-flex">
-                    <div class="f-labels">工作单位:</div>
+                    <div class="f-label">工作单位:</div>
                     <span class="f-left8 f-font-color">{{
                         resiDetailObj.workInfoDto
                         ? resiDetailObj.workInfoDto.workUnit
@@ -255,10 +269,22 @@
             </el-row>
 
             <div class="title-small">关系图谱</div>
-            <graph :userInfo="resiDetailObj.baseInfoDto" v-if="resiDetailObj.baseInfoDto" />
+            <!-- <graph :userInfo="resiDetailObj.baseInfoDto" v-if="resiDetailObj.baseInfoDto" /> -->
             <div class="title-small">人员标签</div>
-            <staff-tag :userInfo="resiDetailObj.baseInfoDto.categoryInfo"
+            <staff-tag :userInfo="resiDetailObj" ref="staffTag" v-if="Object.keys(resiDetailObj).length !== 0"></staff-tag>
-                v-if="Object.keys(resiDetailObj).length !== 0"></staff-tag>
+            <section v-for="(sectionItem, sectionIndex) in expandList" :key="sectionIndex">
+                <div class="title-small" :id="sectionItem.id">{{ sectionItem.title }}</div>
+                <el-row type="flex" justify="" class="f-m-top23" v-for="(row, rowIndex) in sectionItem.rows"
+                    :key="rowIndex + sectionItem.id">
+                    <el-col :span="8" class="f-flex" v-for="(item, itemIndex) in row" :key="itemIndex">
+                        <div class="f-flex">
+                            <div class="f-label">{{ item.label }}：</div>
+                            <span class="f-left8 f-font-color">{{ item.value ? item.value : "--" }}</span>
+                        </div>
+                    </el-col>
+                </el-row>
+            </section>
+
             <div class="title-small">业务记录</div>
             <business-record :userInfo="resiDetailObj"></business-record>
             <div class="title-small">更新记录</div>
@@ -267,7 +293,7 @@
         <el-dialog title="密码验证" :visible.sync="showCheckPassword">
             <el-form :model="form" :rules="rules" ref="form">
                 <el-form-item label="密码" prop="password">
-                    <el-input v-model="form.password" autocomplete="off" placeholder="请输入当前账号密码"></el-input>
+                    <el-input v-model="form.password" autocomplete="off" type="password" placeholder="请输入当前账号密码"></el-input>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -294,59 +320,432 @@ export default {
             showFlagIdCardBtn: true,
             showFlagMobileBtn: true,
             active: 0,
-            menuList: [
+            menuList: [],
+            score: null,
+            age: null,
+
+            nationalityList: [],//国籍字典
+            marriageArr: [],  //婚姻状况字典
+            spouseArr: [],//配偶情况字典
+            careerStatusArr: [],//就业状况字典
+            householdSituationArr: [],//户籍情况字典
+            houseHolderRelArr: [],//与户主关系字典
+            idTypeList,//证件类型字典
+            showCheckPassword: false,
+            originalExpandList: [{
+                id: 'healthDto',
+                title: '残疾信息',
+                children: [
                     {
-                    name: '基本信息',
+                        label: "残疾类别",
-                    num: '（7/7）'
+                        itemType: "select1",
+                        formName: "disabilityCategoryCode",
+                        opctionUrl: 'sys/dict/data/dictlist',
+                        opctionParams: { dictType: 'disability_category_code' },
+                        opction: []
                     },
                     {
-                    name: '居住信息',
+                        label: "残疾等级",
-                    num: '（4/4）'
+                        itemType: "select1",
-
+                        formName: "disabilityLevel",
+                        opctionUrl: 'sys/dict/data/dictlist',
+                        opctionParams: { dictType: 'disability_level' },
+                        opction: []
+                    },
+                    {
+                        label: "残疾证号",
+                        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',
+                title: '大病信息',
+                children: [
+                    {
+                        label: "所患大病",
+                        itemType: "checkbox",
+                        formName: "illnessCodes",
+                        opctionUrl: 'sys/dict/data/dictlist',
+                        opctionParams: { dictType: 'illness_code' },
+                        opction: []
+                    },]
             },
             {
-                    name: '拓展信息',
+                id: 'chronicDiseaseDto',
-                    num: '（3/4）'
+                title: '慢病信息',
+                children: [
+                    {
+                        label: "所患慢病",
+                        itemType: "checkbox",
+                        formName: "chronicDiseaseCodes",
+                        opctionUrl: 'sys/dict/data/dictlist',
+                        opctionParams: { dictType: 'chronic_disease_code' },
+                        opction: []
+                    },
+                ]
             },
             {
-                    name: '党员信息',
+                id: 'deathDto',
-                    num: '（0/3）'
+                title: '死亡信息',
+                children: [
+                    {
+                        label: "死亡时间",
+                        itemType: "datepicker1",
+                        formName: "deathTime",
+                    },
+                ]
+            },
+            {
+                id: 'oldPeopleDto',
+                title: '老年人信息',
+                children: [
+                    {
+                        label: "老年人分类",
+                        itemType: "select1",
+                        multiple: true,
+                        formName: "oldPeopleCategories",
+                        opctionUrl: 'sys/dict/data/dictlist',
+                        opctionParams: { dictType: 'oldPeople_categories' },
+                    },
+                    {
+                        label: "居住情况",
+                        itemType: "select1",
+                        formName: "resideSituation",
+                        opctionUrl: 'sys/dict/data/dictlist',
+                        opctionParams: { dictType: 'reside_situation' },
+                    },
+                    {
+                        label: "高龄补助",
+                        itemType: "inputNum",
+                        formName: "oldSubsidy",
+                    },
+                ]
+            },
+            {
+                id: 'subsistenceAllowanceDto',
+                title: '低保信息',
+                children: [
+                    {
+                        label: "低保类别",
+                        itemType: "select1",
+                        formName: "category",
+                        opctionUrl: 'sys/dict/data/dictlist',
+                        opctionParams: { dictType: 'subsistence_allowance_category' },
+                    },
+                    {
+                        label: "低保享受原因",
+                        itemType: "checkbox",
+                        formName: "reasons",
+                        opctionUrl: 'sys/dict/data/dictlist',
+                        opctionParams: { dictType: 'subsistence_allowance_reasons' },
+                        opction: []
+                    },
 
+                ]
             },
-                // {
-                //     name: '残疾信息（0/3）'
-                // },
-                // {
-                //     name: '大病信息（0/3）'
-                // },
-                // {
-                //     name: '慢病信息（0/3）'
-                // },
-                // {
-                //     name: '退役军人信息（0/3）'
-                // },
-                // {
-                //     name: '保障房信息（0/3）'
-                // },
-                // {
-                //     name: '特扶人员信息（0/3）'
-                // },
             {
-                    name: '业务记录',
+                id: "parymemberInfoDto",
-                    num: '（1）'
+                title: '党员信息',
+                children: [
+                    {
+                        label: "入党时间",
+                        itemType: "datepicker1",
+                        formName: "joinTime",
+                        opction: [
+                        ]
+                    },
+                    {
+                        label: "转正时间",
+                        itemType: "datepicker1",
+                        formName: "positiveTime",
+                        opction: [
+                        ]
+                    },
+                    {
+                        label: "所属党组织",
+                        itemType: "cascader1",
+                        formName: "partyOrgId",
+                        opction: [
+                        ]
+                    },
+                    {
+                        label: "流动党员",
+                        itemType: "radio1",
+                        formName: "flowFlag",
+                        opction: [
+                            { label: '是', value: 1 },
+                            { label: '否', value: 0 },
+                        ]
+                    },
+                    {
+                        label: "流动党员活动证号",
+                        itemType: "input1",
+                        formName: "flowActNum",
+                    },
+                    {
+                        label: "职务",
+                        itemType: "select1",
+                        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 },
+                        ]
                     }, {
-                    name: '更新记录',
+                        label: "党员中心户",
-                    num: '（1）'
+                        itemType: "radio1",
+                        formName: "centerFlag",
+                        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',
+                title: '保障房信息',
+                children: [
+                    {
+                        label: "所在社区",
+                        itemType: "input1",
+                        formName: "liveCommunity",
+                    },
+                    {
+                        label: "住房性质",
+                        itemType: "select1",
+                        formName: "housingNature",
+                        opctionUrl: 'sys/dict/data/house',
+                        opctionParams: { formCode: "resi_base_info" },
+                        opction: [
+                        ]
                     }
-            ],
+                ]
-            age: null,
+            },
+            {
+                id: 'veteranDto',
+                title: '退役军人信息',
+                children: [
+                    {
+                        label: "入伍时间",
+                        itemType: "datepicker1",
+                        formName: "joinArmyTime",
+                        opction: [
+                        ]
+                    },
+                    {
+                        label: "退伍时间",
+                        itemType: "datepicker1",
+                        formName: "leaveArmyTime",
+                        opction: [
+                        ]
+                    },
+                    {
+                        label: "服役单位",
+                        itemType: "input1",
+                        formName: "serviceUnit",
+                    },
+                    {
+                        label: "接收单位",
+                        itemType: "input1",
+                        formName: "receiveUnit",
+                    },
+                    {
+                        label: "待安置补助金",
+                        itemType: "inputNum",
+                        formName: "settlementAmount",
+                        opction: [
 
-            nationalityList: [],//国籍字典
+                        ]
-            marriageArr: [],  //婚姻状况字典
+                    },
-            spouseArr: [],//配偶情况字典
+                    {
-            careerStatusArr: [],//就业状况字典
+                        label: "培训状况",
-            idTypeList,//证件类型字典
+                        itemType: "input1",
-            showCheckPassword: false,
+                        formName: "trainDesc",
+                    },
+                    {
+                        label: "现就业情况",
+                        itemType: "input1",
+                        formName: "employmentSituation",
+                    },
+                    {
+                        label: "是否办理公益性岗位",
+                        itemType: "radio1",
+                        formName: "pubWelfareJobFlag",
+                        opction: [
+                            { label: '是', value: 1 },
+                            { label: '否', value: 0 },
+                        ]
+                    }
+                ]
+            },
+            {
+                id: 'unitedFrontDto',
+                title: '统战人员信息',
+                children: [{
+                    label: "统战类型",
+                    itemType: "input1",
+                    formName: "unitedFrontType",
+                }]
+            },
+            {
+                id: 'volunteerDto',
+                title: '志愿者信息',
+                children: [
+                    {
+                        label: "志愿者类别",
+                        itemType: "checkbox",
+                        formName: "volunteerCategory",
+                        opctionUrl: 'sys/dict/data/dictlist',
+                        opctionParams: { dictType: "VOLUNTEER_CATEGORY" },
+                        opction: [
+                        ]
+                    }
+                ]
+            },
+            {
+                id: 'specialSupportDto',
+                title: '特扶人员信息',
+                children: [
+
+                    {//0
+                        label: "特扶类别",
+                        itemType: "select1",
+                        formName: "specialSupportType",
+                        opction: [
+                            {
+                                value: '1',
+                                label: '失独'
+                            },
+                            {
+                                value: '2',
+                                label: '伤残'
+                            }
+                        ]
+                    },
+                    {//1
+                        label: "子女姓名",
+                        itemType: "input1",
+                        formName: "childName",
+                        opction: [
+                        ]
+                    },
+                    {//2
+                        label: "子女性别",
+                        itemType: "select1",
+                        formName: "childGender",
+                        opction: [
+                            {
+                                value: '1',
+                                label: '男'
+                            },
+                            {
+                                value: '2',
+                                label: '女'
+                            }
+                        ]
+                    },
+                    {
+                        label: "子女死亡日期",
+                        itemType: "datepicker1",
+                        formName: "certificateDate",
+                        opction: [],
+                    },
+                    {
+                        label: "子女伤残类别",
+                        itemType: "select1",
+                        formName: "childDisabilityCategoryCode",
+                        opctionUrl: 'sys/dict/data/dictlist',
+                        opctionParams: { dictType: 'disability_category_code' },
+                        opction: []
+                    },
+                    {
+                        label: "子女伤残等级",
+                        itemType: "select1",
+                        formName: "childDisabilityLevel",
+                        opctionUrl: 'sys/dict/data/dictlist',
+                        opctionParams: { dictType: 'disability_level' },
+                        opction: []
+                    }
+
+                ]
+            },],
+            expandList: [],
             form: {
                 password: ''//脱敏确认密码
             },
@@ -359,24 +758,20 @@ export default {
     },
     components: { graph, staffTag, businessRecord, changeRecord },
     async created() {
-        this.resiId = this.$store.state.huaXiang.userInfo.resiId;
+        // this.resiId = this.$store.state.huaXiang.userInfo.resiId;
-        console.log(this.$store.state.huaXiang.userInfo);
+        // await this.getNationalityList();
-        await this.getNationalityList();
+        // this.getResiDetail();
-        this.getResiDetail();
+        // this.getMarriage()
-        this.getMarriageNation()
+        // this.getSpouse()
-        this.getSpouse()
+        // this.getCareerStatus()
-        this.getChangeRecordDetailById()
+        // this.getChangeRecordDetailById()
+        // this.getHouseholdSituation()
+        // this.gethouseHolderRel()
     },
     mounted() {
     },
     activated() {
-        this.resiDetailObj = null
+
-        this.resiId = this.$store.state.huaXiang.userInfo.resiId;
-        this.getNationalityList();
-        this.getResiDetail();
-        this.getMarriageNation()
-        this.getSpouse()
-        this.getChangeRecordDetailById()
     },
     methods: {
 
@@ -421,26 +816,109 @@ export default {
         },
         getResiDetail() {
             this.$http
-                .get(`/actual/base/residentIntegratedInfo/detail/masked/1740209624289349634`)
+                .get(`/actual/base/residentIntegratedInfo/detail/masked/${this.resiId}`)
-                .then((res) => {
+                .then(async (res) => {
-                    console.log(res.data.data, 'resiDetailObj');
                     this.resiDetailObj = res.data.data || {};
-                    // this.resiDetailObj.nationalityName = ''
+                    const nameMap = {
+                        ext: '拓展信息',
+                        united_front: '统战人员信息',
+                        party_member: '党员信息',
+                        death: '死亡信息',
+                        disability: '残疾信息',
+                        subsistence_allowance: '低保信息',
+                        serious_illness: '大病信息',
+                        veteran: '退役军人信息',
+                        special_support: '特扶人员信息',
+                        old_people: '老年人信息',
+                        ensure_house: '保障房信息',
+                        chronic_disease: '慢病信息',
+                        base: '基本信息'
+                    };
+                    this.menuList = Object.entries(res.data.data.integrityData.integrityQtyMap).map(([key, value]) => ({
+                        name: nameMap[key],
+                        id: key,
+                        filledQty: value.filledQty,
+                        totalQty: value.totalQty
+                    })).reverse();
+
+                    let arr = this.menuList.filter(item => item.filledQty > 0 && item.name !== '基本信息' && item.name !== '拓展信息');
+                    this.expandList = this.originalExpandList.filter(itemA => {
+                        return arr.some(itemB => itemB.name === itemA.title);
+                    });
+                    await Promise.all(this.expandList.map(async item => {
+                        await Promise.all(item.children.map(async child => {
+                            const key = child.formName;
+                            if (this.resiDetailObj[item.id].hasOwnProperty(key)) {
+                                child.value = await this.getDictName(child.opctionUrl, child.opctionParams, this.resiDetailObj[item.id][key], child.itemType, item.opction);
+                            }
+                        }));
+
+                    }));
+                    this.expandList.forEach(item => {
+                        const rows = [];
+                        const chunkSize = 3;
+                        for (let i = 0; i < item.children.length; i += chunkSize) {
+                            rows.push(item.children.slice(i, i + chunkSize));
+                        }
+                        item.rows = rows;
+                    });
+                    this.menuList.push(
+                        {
+                            name: '业务记录',
+                            filledQty: 1,
+                            totalQty: 1
+                        },
+                        {
+                            name: '更新纪录',
+                            filledQty: 1,
+                            totalQty: 1
+                        }
+                    );
+
+                    this.score = res.data.data.integrityData.score;
                     const birthdayTimestamp = Date.parse(res.data.data.baseInfoDto.birthday);
                     this.age = this.calculateAge(birthdayTimestamp);
                     this.nationalityList.forEach(element => {
                         if (element.value === res.data.data.nationality) {
-                            this.resiDetailObj.baseInfoDto.nationalityName = element.label
+                            this.resiDetailObj.baseInfoDto.nationalityName = element.label;
                         }
                     });
-
                 })
                 .catch((err) => {
                     console.log(err);
                 });
         },
-        handelCLickMenu(index) {
+
+        async getDictName(url, params, value, itemType, opction) {
+            try {
+                if (url) {
+                    const { data } = await this.$http.post(url, params);
+                    const dictData = data.data;
+                    if (itemType == 'checkbox') {
+                        const matchedItem = dictData.find(item => value.includes(item.value.toString()));
+                        return matchedItem ? matchedItem.label : '--';
+                    } else if (itemType == 'select1') {
+                        const matchedItem = dictData.find(item => item.value === value);
+                        return matchedItem ? matchedItem.label : '--';
+                    }
+                } else {
+                    if (itemType == 'radio') {
+                        const matchedItem = opction.find(item => item.value === value)
+                        return matchedItem ? matchedItem.label : '--';
+                    } else if (itemType == 'input1') {
+                        return value ? value : '--';
+                    }
+                }
+            } catch (error) {
+                console.log(error);
+            }
+        },
+
+        handelCLickMenu(id, index) {
             this.active = index
+            if (index == 0) return
+            const bottomElement = document.getElementById('pane-jumin-huaxiang');
+            bottomElement.scrollIntoView({ behavior: 'smooth', block: 'end' });
         },
         handelCLickShowCheckPassword(type) {
             this.form.password = '';
@@ -500,10 +978,8 @@ export default {
             }
         },
 
-
-
         // 婚姻状况字典
-        async getMarriageNation() {
+        async getMarriage() {
             try {
                 const { data } = await this.$http.post("sys/dict/data/dictlist", {
                     dictType: "marriage",
@@ -514,7 +990,7 @@ export default {
             }
         },
         // 就业状态字典
-        async getMarriageNation() {
+        async getCareerStatus() {
             try {
                 const { data } = await this.$http.post("sys/dict/data/dictlist", {
                     dictType: "career_status",
@@ -524,7 +1000,17 @@ export default {
                 console.log(error, "获取就业状态字典");
             }
         },
-
+        // 人户状况
+        async getHouseholdSituation() {
+            try {
+                const { data } = await this.$http.post("sys/dict/data/dictlist", {
+                    dictType: "household_situation",
+                });
+                this.householdSituationArr = data.data;
+            } catch (error) {
+                console.log(error, "获取人户状况");
+            }
+        },
         // 配偶情况
         async getSpouse() {
             try {
@@ -536,8 +1022,38 @@ export default {
                 console.log(error, "获取配偶情况字典");
             }
         },
+        // 与户主关系
+        async gethouseHolderRel() {
+            try {
+                const { data } = await this.$http.post("sys/dict/data/relationship", {
+                    formCode: "resi_base_info",
+                });
+                this.houseHolderRelArr = data.data;
+            } catch (error) {
+                console.log(error, "获取与户主关系");
+            }
+        },
+        houseHolderRelText(index) {
+            let text = "--";
+            this.houseHolderRelArr.forEach((item) => {
+                if (item.value == this.resiDetailObj.resideInfoDtos[index].houseHolderRel) {
+                    text = item.label;
+                }
+            });
+            return text;
+        },
+        householdSituationText(index) {
+            let text = "--";
+            this.householdSituationArr.forEach((item) => {
+                if (item.value == this.resiDetailObj.resideInfoDtos[index].householdSituation) {
+                    text = item.label;
+                }
+            });
+            return text;
+        }
     },
     computed: {
+
         categoryDictText() {
             let text = "--";
             this.marriageArr.forEach((item) => {
@@ -575,7 +1091,24 @@ export default {
             return text;
         }
     },
-    watch: {},
+    watch: {
+        '$store.state.huaXiang.userInfo.resiId': {
+            handler(newValue, oldValue) {
+                this.resiDetailObj = null
+                this.resiId = newValue;
+                this.getNationalityList();
+                this.getResiDetail();
+                this.getMarriage()
+                this.getSpouse()
+                this.getCareerStatus()
+                this.getChangeRecordDetailById()
+                this.getHouseholdSituation()
+                this.gethouseHolderRel()
+            },
+            deep: true, // 开启深度监听
+            immediate: true // 立即触发一次handler
+        }
+    }
 }
 </script>