diff --git a/project/sass/apps/grid/AppGridBlock/components/add.vue b/project/sass/apps/grid/AppGridBlock/components/add.vue index 4c13d10a..96ddba12 100644 --- a/project/sass/apps/grid/AppGridBlock/components/add.vue +++ b/project/sass/apps/grid/AppGridBlock/components/add.vue @@ -17,10 +17,10 @@ - + - + @@ -181,7 +181,10 @@ export default { if (this.isEdit) { this.searchDetail(); } else { - this.forms = this.$route.query + this.forms = { + ...this.forms, + ...this.$route.query + } } }, methods: { @@ -372,7 +375,11 @@ export default { params: {id}, }).then((res) => { if (res?.data) { - this.forms = {...res.data}; + this.forms = { + ...res.data, + girdMemberManageList: res.data.girdMemberManageList ? res.data.girdMemberManageList : [], + girdMemberList: res.data.girdMemberList ? res.data.girdMemberList : [], + }; this.parentGirdInfo = res.data.parentGirdInfo; this.forms.parentGirdName = res.data.parentGirdInfo && res.data.parentGirdInfo.girdName; } diff --git a/project/sass/apps/grid/AppGridMember/components/Family.vue b/project/sass/apps/grid/AppGridMember/components/Family.vue index 99c69374..f76dfd5c 100644 --- a/project/sass/apps/grid/AppGridMember/components/Family.vue +++ b/project/sass/apps/grid/AppGridMember/components/Family.vue @@ -267,7 +267,7 @@ size: 200, con: this.name, householdName: 1, - areaId: this.areaId, + searchAreaId: this.areaId, } }).then(res => { if (res.code == 0) {