From 2ec40680da7f7280f38aca06d50075c4bc8804bf Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Sat, 30 Mar 2024 16:22:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E8=8F=9C=E5=8D=95=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/portrayal/jumin/cpts/graph.vue | 2 +- src/views/modules/portrayal/jumin/index.vue | 132 ++++++++---------- 2 files changed, 61 insertions(+), 73 deletions(-) diff --git a/src/views/modules/portrayal/jumin/cpts/graph.vue b/src/views/modules/portrayal/jumin/cpts/graph.vue index b1994d66c..f85e1e728 100644 --- a/src/views/modules/portrayal/jumin/cpts/graph.vue +++ b/src/views/modules/portrayal/jumin/cpts/graph.vue @@ -61,7 +61,7 @@ export default { let url = `/actual/base/peopleRoomOverview/getFamilyRelationshipList?type=0&resid=` + this.userInfo.resiId; let { code, data, msg } = await requestPost(url) if (code == 0) { - let index = data.findIndex(item => item.name == this.userInfo.name); + let index = data.findIndex(item => item.id == this.userInfo.resiId); if (index !== -1) { const [item] = data.splice(index, 1); data.unshift(item); diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue index 908865d82..6cb8f8e15 100644 --- a/src/views/modules/portrayal/jumin/index.vue +++ b/src/views/modules/portrayal/jumin/index.vue @@ -23,7 +23,6 @@ :class="{ item: true, active: index == active }" v-for="(item, index) in menuList" @click="handelCLickMenu(item.id, index)" - v-show="item.filledQty != 0 || item.id == 'ext' || item.id == 'reside'" > {{ item.name }} { - if (res.data.code === 0) { + async getResiDetail() { + try { + const res = await this.$http.get(`/actual/base/residentIntegratedInfo/detail/masked/${this.resiId}`); + if (res.data.code === 0) { this.resiDetailObj = res.data.data || {}; const nameMap = { - reside: "居住信息", - ext: "拓展信息", - united_front: "统战人员信息", - party_member: "党员信息", - death: "死亡信息", - disability: "残疾信息", - subsistence_allowance: "低保信息", - serious_illness: "大病信息", - veteran: "退役军人信息", - special_support: "特扶人员信息", - old_people: "老年人信息", - ensure_house: "保障房信息", - chronic_disease: "慢病信息", - base: "基本信息", - business_record:'业务记录', - update_record:'更新记录' + reside: "居住信息", + ext: "拓展信息", + united_front: "统战人员信息", + party_member: "党员信息", + death: "死亡信息", + disability: "残疾信息", + subsistence_allowance: "低保信息", + serious_illness: "大病信息", + veteran: "退役军人信息", + special_support: "特扶人员信息", + old_people: "老年人信息", + ensure_house: "保障房信息", + chronic_disease: "慢病信息", + base: "基本信息", + business_record: '业务记录', + update_record: '更新记录' }; - this.menuList = Object.entries( - res.data.data.integrityData.integrityQtyMap - ) - .map(([key, value]) => ({ - name: nameMap[key], - id: key, - filledQty: value.filledQty, - totalQty: value.totalQty, - })) - .reverse(); - const keysWithValueOne = []; + + const keysWithValueOne = []; for (const key in this.resiDetailObj.baseInfoDto.categoryInfo) { if (this.resiDetailObj.baseInfoDto.categoryInfo[key] === 1) { keysWithValueOne.push(this.incidence[key].formId); } } - this.expandList = this.originalExpandList.filter((itemA) => { - return keysWithValueOne.some((itemB) => itemB === itemA.id); + const keysWithValueOneName = keysWithValueOne.map(str => { + const matchedObject = this.originalExpandList.find(obj => obj.id === str); + return matchedObject ? matchedObject.title : null; }); - 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 == "partyOrgId" ? "branchId" : key - ], - child.itemType, - child.opction - ); - } - }) - ); - }) - ); + this.menuList = Object.entries(res.data.data.integrityData.integrityQtyMap) + .map(([key, value]) => ({ + name: nameMap[key], + id: key, + filledQty: value.filledQty, + totalQty: value.totalQty, + })) + .reverse() + .filter(item => item.name === '基本信息' || item.name === '拓展信息' || item.name === '居住信息' || keysWithValueOneName.includes(item.name)); this.menuList.push( - { - name: "业务记录", - id: "businessRecord", - }, - { - name: "更新纪录", - id: "updateRecord", - } + { name: "业务记录", id: "businessRecord" }, + { name: "更新纪录", id: "updateRecord" } ); + this.expandList = this.originalExpandList.filter(itemA => keysWithValueOne.includes(itemA.id)); + + 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] && this.resiDetailObj[item.id].hasOwnProperty(key)) { + child.value = await this.getDictName( + child.opctionUrl, + child.opctionParams, + this.resiDetailObj[item.id][key == "partyOrgId" ? "branchId" : key], + child.itemType, + child.opction + ); + } + })); + })); + this.score = res.data.data.integrityData.score; - } else if (res.data.code >= 8000) { + } else if (res.data.code >= 8000) { this.resiDetailObj = {}; this.$message.error(res.data.msg); - } - }) - .catch((err) => { - console.log(err); - }); - }, + } + } catch (err) { + console.log(err); + } +}, + handelClickJumpEdit() { this.checkType = "edit"; this.showCheckPassword = true; @@ -1490,8 +1480,6 @@ export default { }, computed: { familyStatus(){ - console.log(this.resiDetailObj.baseInfoDto.gender); - console.log(this.resiDetailObj.baseInfoDto.age ); var status = ''; if(this.resiDetailObj.baseInfoDto){ if(this.resiDetailObj.baseInfoDto.gender =='1' && this.resiDetailObj.baseInfoDto.age <18){