diff --git a/src/assets/scss/pages/resiInfo.scss b/src/assets/scss/pages/resiInfo.scss index ea519de3d..1262f0e2f 100644 --- a/src/assets/scss/pages/resiInfo.scss +++ b/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; } diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue index 049f942d1..fc105c67a 100644 --- a/src/views/components/addResi.vue +++ b/src/views/components/addResi.vue @@ -606,8 +606,8 @@ export default { children: [ { label: "所患大病", - itemType: "select1", - formName: "illnessCode", + itemType: "checkbox", + 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: [] diff --git a/src/views/components/resiExpand/index.vue b/src/views/components/resiExpand/index.vue index 8dae3f639..ca51e964d 100644 --- a/src/views/components/resiExpand/index.vue +++ b/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 }, // 统战人员 diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index 6ccdc07e5..2e9b89933 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -1042,7 +1042,7 @@ export default { }, { label: "通知书领取日期", - itemType: "datepicker1",//我在父组件中调用子组件,当我在父组件切换到其他子组件时,子组件的值会丢失,需要保存起来 + itemType: "datepicker1", formName: "notificationRcvDate", opction: [] }, diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 3b6929ffd..962821f43 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -70,7 +70,8 @@ {{ handleFilterSpan(scope.row, item) }}
- {{ scope.row.gender == null ? '--' : scope.row.gender == 1 ? '男' : scope.row.gender == 2 ? '女' : '--' }} + {{ scope.row.gender == null ? '--' : scope.row.gender == 1 ? '男' : scope.row.gender == 2 ? '女' : + '--' }}
{{ @@ -240,7 +241,7 @@ @@ -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; }); }, - - // 编辑 - async handleEdit(row) { + handelCLickShowCheckPassword(row) { this.editUserId = row.resiId; - this.formName = "编辑居民"; - this.formType = 'edit' - this.dialogVisible = true; - await this.residentBaseInfo(); + this.showCheckPassword = true; }, - // 获取详情 - residentBaseInfo() { - this.$http - .post(`/actual/base/residentBaseInfo/detail/clear/${this.editUserId}`) - .then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg); + 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; + this.$refs.baseForm.old_from(data); + this.showCheckPassword = false } else { - this.$refs.baseForm.old_from(res.data); + this.$message.error(msg); } - }) - .catch((err) => { - return this.$message.error("网络错误"); - }); + } else { + return false + } + }) }, + // 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(); }, diff --git a/src/views/modules/communityParty/elegant/detail.vue b/src/views/modules/communityParty/elegant/detail.vue index 084305fd4..bd75108a6 100644 --- a/src/views/modules/communityParty/elegant/detail.vue +++ b/src/views/modules/communityParty/elegant/detail.vue @@ -72,7 +72,6 @@ export default { watch: {}, async mounted () { - console.log('mounted-----我执行了') }, diff --git a/src/views/modules/portrayal/jumin/cpts/graph.vue b/src/views/modules/portrayal/jumin/cpts/graph.vue index b885fc660..2811b39f8 100644 --- a/src/views/modules/portrayal/jumin/cpts/graph.vue +++ b/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': `
${item.name.length === 2 ? + 'innerHTML': `
${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}）岁
` + item.name.substring(0, 1) + '*' + item.name.substring(2)} ${item.age?`（${item.age}）岁`:''}
` })) let lineList = data.map((item, index) => ({ 'from': 'N1', diff --git a/src/views/modules/portrayal/jumin/cpts/staffTag.vue b/src/views/modules/portrayal/jumin/cpts/staffTag.vue index 44b7ac4da..cff08638a 100644 --- a/src/views/modules/portrayal/jumin/cpts/staffTag.vue +++ b/src/views/modules/portrayal/jumin/cpts/staffTag.vue @@ -17,8 +17,9 @@ - {{ item.label + {{ item.label }} @@ -45,7 +46,7 @@ export default { type: 'radio', option: [ { label: '群众', value: 0 }, - { label: '党员', value: 1}, + { label: '党员', value: 1 }, { label: '共青团员', value: 2 }, ] }, @@ -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.categoryInfo[flag] === 1) { + if (this.userInfo.baseInfoDto.categoryInfo[flag] === 1) { valueArray.push(flag); } else { this.formData.tableData[dataIndex].value = valueArray.filter(item => item !== flag); } }; - - // 更新 partyFlag - 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'; + if(this.userInfo.baseInfoDto.categoryInfo.specialCrowdFlag == 1){ + this.formData.tableData[3].value.push(...this.userInfo.specialDto.specialCategoryCodes); } + this.formData.tableData[0].value = this.userInfo.baseInfoDto.categoryInfo.partyFlag; //添加回填需要在这里加上key与对应的index(在formData.tableData中对应的下标) updateValue('disabilityFlag', 1); updateValue('seriousIllnessFlag', 1); @@ -233,9 +231,9 @@ export default { updateValue('publicWelfareFlag', 4); }, handeleClickRadio(val) { - this.$emit('showDialog', {value:val === '1'?'parymemberInfoDto':val},val === '1') + this.$emit('showDialog', { value: val === '1' ? 'parymemberInfoDto' : val }, val === '1') }, - handeleClickchckbox(item, event,index) { + handeleClickchckbox(item, event, index) { item.index = index this.$emit('showDialog', item, event) } @@ -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 + } }, } diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue index 2fd3f892a..36bc8659e 100644 --- a/src/views/modules/portrayal/jumin/index.vue +++ b/src/views/modules/portrayal/jumin/index.vue @@ -9,16 +9,17 @@
-
信息完整度 70
+
信息完整度 {{ score }}
+ @click="handelCLickMenu(item.id, index)" v-show="item.filledQty != 0"> {{ item.name }}{{ - item.num }} + :class="{ 'incomplete': item.filledQty != item.totalQty && index != active, 'full': item.filledQty == item.totalQty }">（{{ + item.filledQty }}/{{ + item.totalQty }}）
@@ -118,14 +119,14 @@
备注：
- {{ resiDetailObj.baseInfoDt && resiDetailObj.baseInfoDto.remark ? resiDetailObj.baseInfoDto.remark : + {{ resiDetailObj.baseInfoDto.remark ? resiDetailObj.baseInfoDto.remark : "--" }}
创建日期：
- {{ resiDetailObj.baseInfoDt && resiDetailObj.baseInfoDto.createdTime ? + {{ resiDetailObj.baseInfoDto.createdTime ? resiDetailObj.baseInfoDto.createdTime : "--" }} @@ -134,46 +135,59 @@
更新时间：
- {{ resiDetailObj.baseInfoDt && resiDetailObj.baseInfoDto.updatedTime ? + {{ resiDetailObj.baseInfoDto.updatedTime ? resiDetailObj.baseInfoDto.updatedTime : "--" }}
居住信息
- - - -
-
人房关系：
- -- -
- - -
-
人户状况：
- -- -
- - -
户籍所在地：
-
- -- -
- - -
与户主关系：
- -- - - +
+ + +
+
所属网格：
+ + {{ item.gridName || '--' }} + +
+ + +
+
所属房屋：
+ + {{ item.gridName + '-' + item.homeName || '--' }} + +
+ + + + +
+
人房关系：
+ + {{ item.resiHouseRel != null ? item.resiHouseRel === 0 ? '自住' : item.resiHouseRel === + 1 ? '租住' : '--' : '--' }} + +
+ + +
+
人户状况：
+ {{ householdSituationText(indexK) }} +
+ + +
户籍所在地：
+
+ {{ item.placeOfDomicile || '--' }} +
+ + +
与户主关系：
+ {{ houseHolderRelText(indexK) }} + + +
拓展信息
@@ -205,7 +219,7 @@ -
工作单位:
+
工作单位:
{{ resiDetailObj.workInfoDto ? resiDetailObj.workInfoDto.workUnit @@ -255,10 +269,22 @@
关系图谱
- +
人员标签
- + +
+
{{ sectionItem.title }}
+ + +
+
{{ item.label }}：
+ {{ item.value ? item.value : "--" }} +
+ + +
+
业务记录
更新记录
@@ -267,7 +293,7 @@ - +
@@ -294,59 +320,432 @@ export default { showFlagIdCardBtn: true, showFlagMobileBtn: true, active: 0, - menuList: [ - { - name: '基本信息', - num: '（7/7）' - }, - { - name: '居住信息', - num: '（4/4）' - - }, - { - name: '拓展信息', - num: '（3/4）' - }, - { - name: '党员信息', - num: '（0/3）' - - }, - // { - // name: '残疾信息（0/3）' - // }, - // { - // name: '大病信息（0/3）' - // }, - // { - // name: '慢病信息（0/3）' - // }, - // { - // name: '退役军人信息（0/3）' - // }, - // { - // name: '保障房信息（0/3）' - // }, - // { - // name: '特扶人员信息（0/3）' - // }, - { - name: '业务记录', - num: '（1）' - }, { - name: '更新记录', - num: '（1）' - } - ], + menuList: [], + score: null, age: null, nationalityList: [],//国籍字典 marriageArr: [], //婚姻状况字典 spouseArr: [],//配偶情况字典 careerStatusArr: [],//就业状况字典 + householdSituationArr: [],//户籍情况字典 + houseHolderRelArr: [],//与户主关系字典 idTypeList,//证件类型字典 showCheckPassword: false, + originalExpandList: [{ + id: 'healthDto', + title: '残疾信息', + children: [ + { + label: "残疾类别", + itemType: "select1", + formName: "disabilityCategoryCode", + opctionUrl: 'sys/dict/data/dictlist', + opctionParams: { dictType: 'disability_category_code' }, + opction: [] + }, + { + label: "残疾等级", + 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: [] + },] + }, + { + id: 'chronicDiseaseDto', + title: '慢病信息', + children: [ + { + label: "所患慢病", + itemType: "checkbox", + formName: "chronicDiseaseCodes", + opctionUrl: 'sys/dict/data/dictlist', + opctionParams: { dictType: 'chronic_disease_code' }, + opction: [] + }, + ] + }, + { + id: 'deathDto', + 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: [] + }, + + ] + }, + { + id: "parymemberInfoDto", + 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 }, + ] + }, { + label: "党员中心户", + 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: [ + ] + } + ] + }, + { + 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: [ + + ] + }, + { + label: "培训状况", + itemType: "input1", + 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; - console.log(this.$store.state.huaXiang.userInfo); - await this.getNationalityList(); - this.getResiDetail(); - this.getMarriageNation() - this.getSpouse() - this.getChangeRecordDetailById() + // this.resiId = this.$store.state.huaXiang.userInfo.resiId; + // await this.getNationalityList(); + // this.getResiDetail(); + // this.getMarriage() + // this.getSpouse() + // this.getCareerStatus() + // 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`) - .then((res) => { - console.log(res.data.data, 'resiDetailObj'); + .get(`/actual/base/residentIntegratedInfo/detail/masked/${this.resiId}`) + .then(async (res) => { 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 + } + } }