From 05a4e30e31fb99a97dae18f41cfe03d36113fad3 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 29 Mar 2024 14:28:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E8=AF=A6=E6=83=85=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E5=A7=93=E5=90=8D=E6=8B=BF=E6=9C=AA=E8=84=B1=E6=95=8F?=
 =?UTF-8?q?=E7=9A=84,=E5=B1=85=E6=B0=91=E8=AF=A6=E6=83=85=E6=8B=93?=
 =?UTF-8?q?=E5=B1=95=E4=BF=A1=E6=81=AF=E6=94=B9=E4=B8=BA=E5=8F=AA=E8=A6=81?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E5=B0=B1=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/editResi.vue             |  1 +
 src/views/modules/base/resi.vue               |  2 +-
 .../portrayal/jumin/cpts/businessRecord.vue   |  1 -
 src/views/modules/portrayal/jumin/index.vue   | 75 ++++++++++++++++---
 4 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 4e964e28f..6d94c4bd3 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -1549,6 +1549,7 @@ export default {
             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, //婚姻状况
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index f8a40f883..102bb5705 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1057,7 +1057,7 @@ export default {
             this.$router.push({
               name: "edit-resi",
               query: { id: this.editUserId },
-              params: { idNum: data.idNum, mobile: data.mobile },
+              params: { idNum: data.idNum, mobile: data.mobile,name:data.name },
             });
             this.checkPasswordFrom.password = "";
           } else {
diff --git a/src/views/modules/portrayal/jumin/cpts/businessRecord.vue b/src/views/modules/portrayal/jumin/cpts/businessRecord.vue
index b2f6e980a..3f4f4f449 100644
--- a/src/views/modules/portrayal/jumin/cpts/businessRecord.vue
+++ b/src/views/modules/portrayal/jumin/cpts/businessRecord.vue
@@ -235,7 +235,6 @@ export default {
         });
     },
     getfuwuList() {
-      console.log(this.resiId);
       if (this.resiId.length == 0) {
         this.fuwuList = [];
         this.fuwuLabel = `社区服务（0）`;
diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue
index bf2e71b01..3f39030aa 100644
--- a/src/views/modules/portrayal/jumin/index.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -21,7 +21,7 @@
             :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'"
+            v-show="item.filledQty != 0 || item.id == 'ext' || item.id == 'reside'"
           >
             <span>{{ item.name }}</span
             ><span
@@ -1063,6 +1063,64 @@ export default {
       rules: {
         password: [{ required: true, message: "请输入密码", trigger: "blur" }],
       },
+      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: "deathDto", formType: "deathDto", title: "死亡" },
+        oldPeopleFlag: {
+          formId: "oldPeopleDto",
+          formType: "oldPeopleDto",
+          title: "老年人信息",
+        },
+        subsistenceAllowanceFlag: {
+          formId: "subsistenceAllowanceDto",
+          formType: "subsistenceAllowanceDto",
+          title: "低保人员信息",
+        },
+        veteranFlag: {
+          formId: "veteranDto",
+          formType: "veteranDto",
+          title: "退役军人信息",
+        },
+        ensureHouseFlag: {
+          formId: "ensureHouseDto",
+          formType: "ensureHouseDto",
+          title: "保障性住房信息",
+        },
+        specialSupportFlag: {
+          formId: "specialSupportDto",
+          formType: "specialSupportDto",
+          title: "特扶人员",
+        },
+        unitedFrontFlag: {
+          formId: "unitedFrontDto",
+          formType: "unitedFrontDto",
+          title: "统战人员",
+        },
+        volunteerFlag: {
+          formId: "volunteerDto",
+          formType: "volunteerDto",
+          title: "志愿者",
+        },
+      },
     };
   },
   components: { graph, staffTag, businessRecord, changeRecord },
@@ -1127,14 +1185,14 @@ export default {
                 totalQty: value.totalQty,
               }))
               .reverse();
-            let arr = this.menuList.filter(
-              (item) =>
-                item.filledQty > 0 ||(
-                item.name == "拓展信息" ||
-                item.name == "基本信息")
-            );
+              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 arr.some((itemB) => itemB.name === itemA.title);
+              return keysWithValueOne.some((itemB) => itemB === itemA.id);
             });
             await Promise.all(
               this.expandList.map(async (item) => {
@@ -1157,7 +1215,6 @@ export default {
               })
             );
 
-            
             this.menuList.push(
               {
                 name: "业务记录",