diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 762b0c83b..7b388a325 100644
--- a/src/views/components/editResi.vue
+++ b/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, //婚姻状况
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'"
>
{{ item.name }}
- 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: "业务记录",