From 6d6514b18449b4379ef71634c706af9f7ae89abd Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 12 Nov 2021 13:47:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=97=AF=E5=97=AF=E5=97=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/editResi.vue | 5 ++++- src/views/components/resiSearch.vue | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index 1be440e7..cc12bf3b 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -680,8 +680,11 @@ export default { }, getGridList () { const { user } = this.$store.state + let purpose = 'query' + if (this.disabled) purpose = 'query' + else purpose = 'addorupdate' this.$http - .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId }) + .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose }) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index d286fee3..579c7c8b 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -455,7 +455,7 @@ export default { getGridList() { const { user } = this.$store.state this.$http - .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId }) + .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' }) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) From 44e2fc8805d0f5fea29501e0a1583aa8089a36c8 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 12 Nov 2021 14:23:38 +0800 Subject: [PATCH 2/2] dd --- src/views/components/editResi.vue | 14 +++++++++----- src/views/components/resiSearch.vue | 3 ++- src/views/modules/base/resi.vue | 5 +++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index cc12bf3b..27be335d 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -14,7 +14,7 @@ - +
@@ -33,7 +33,7 @@ - +
0) { - if (!_form.AGENCY_ID) _form.AGENCY_ID = this.$store.state.user.agencyId + if (!_form.AGENCY_ID) _form.AGENCY_ID = this.agencyId } if (!_form.ID) _form.ID = ID } @@ -684,7 +688,7 @@ export default { if (this.disabled) purpose = 'query' else purpose = 'addorupdate' this.$http - .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose }) + .post('/gov/org/customergrid/gridoption', { agencyId: this.agencyId, purpose }) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) @@ -700,7 +704,7 @@ export default { getValiheList () { const { user } = this.$store.state this.$http - .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.form.GRID_ID, agencyId: user.agencyId }) + .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.form.GRID_ID, agencyId: this.agencyId }) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 579c7c8b..53fc6314 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -473,7 +473,8 @@ export default { this.$http .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.form.GRID_ID, - agencyId: user.agencyId + agencyId: '' + // agencyId: user.agencyId }) .then(({ data: res }) => { if (res.code !== 0) { diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 73289a9f..5d77767b 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -160,6 +160,7 @@ :form-info="editForm" :fixed="true" :form-list="formList" + :agency-id="editAgencyId" @changegroup="handleChangeGroup" />
@@ -180,6 +181,7 @@ :muti-list="item.mutiList" :form-list="item.itemList" :disabled="disabled" + :agency-id="editAgencyId" /> @@ -230,6 +232,7 @@ export default { activeName: '', tableData: [], searchList: [], + editAgencyId: '', editForm: { GRID_ID: '', VILLAGE_ID: '', @@ -411,11 +414,13 @@ export default { }, async handleLook(row) { this.disabled = true + this.editAgencyId = row.ORG_ID await this.getFormList('edit') this.getrowInfo(row.icResiUserId) }, async handleEdit(row) { this.disabled = false + this.editAgencyId = row.ORG_ID await this.getFormList('edit') await this.getrowInfo(row.icResiUserId) },