Merge branch 'fix_bug' into dev

src/views/components/editResi.vue

@@ -1555,6 +1555,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, //婚姻状况

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 {

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）`;

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(
+              const keysWithValueOne = [];
-              (item) =>
+            for (const key in this.resiDetailObj.baseInfoDto.categoryInfo) {
-                item.filledQty > 0 ||(
+                if (this.resiDetailObj.baseInfoDto.categoryInfo[key] === 1) {
-                item.name == "拓展信息" ||
+                    keysWithValueOne.push(this.incidence[key].formId);
-                item.name == "基本信息")
+                }
-            );
+            }
             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: "业务记录",