From 04d2893e34eda90160c54c6ab534b45733338c1d Mon Sep 17 00:00:00 2001 From: HAHA Date: Fri, 5 Aug 2022 17:17:47 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/organization/organization.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index caf9fbcbe..13186ceab 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -790,6 +790,11 @@ + + + + + @@ -1005,7 +1010,9 @@ export default { agencyId: '', gridType: '', manageDistrict: '', - griId: '' + griId: '', + // 排序 + gridSort: 0, }, judgeOrgInfoLevel: [], keyWords: '', @@ -2401,7 +2408,8 @@ export default { contacts: this.modifyGridFrom.contacts, mobile: this.modifyGridFrom.mobile, code: this.modifyGridFrom.code, - gridType: this.modifyGridFrom.gridType + gridType: this.modifyGridFrom.gridType, + sort:this.modifyGridFrom.gridSort } const { data, code, msg } = await requestPost(url, params) From 5ed9cc309396133ea4c9333ea10ae871ab0e39df Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 9 Aug 2022 10:11:08 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/organization/organization.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index 13186ceab..7c67f55fd 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -1588,6 +1588,7 @@ export default { this.modifyGridFrom.gridType = '', this.modifyGridFrom.manageDistrict = '', this.modifyGridFrom.griId = '' + this.modifyGridFrom.gridSort = 0 }, // 社区新增弹框取消按钮 cancel () { @@ -2339,6 +2340,7 @@ export default { this.modifyGridFrom.gridType = data.gridType this.modifyGridFrom.manageDistrict = data.manageDistrict this.modifyGridFrom.griId = data.grid + this.modifyGridFrom.gridSort = data.gridSort } else { this.$message.error(msg) } @@ -2416,6 +2418,7 @@ export default { if (code === 0) { this.$message.success("修改成功") + this.modifyGridFrom.gridSort = 0 this.modifyGridPop = false this.getAgencyList() this.getDepartmentList() From d6e587ad2f88fffe638fa5d43df6767cd6264119 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 9 Aug 2022 10:40:05 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=9C=80=E5=B0=8F?= =?UTF-8?q?=E4=B8=BA1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/organization/organization.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index 7c67f55fd..128896a9e 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -792,7 +792,7 @@ - + From d7a022b98b803d92c5fb360aa0050c2da5a06810 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 9 Aug 2022 10:42:57 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/organization/organization.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index 128896a9e..7e170800e 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -2418,7 +2418,6 @@ export default { if (code === 0) { this.$message.success("修改成功") - this.modifyGridFrom.gridSort = 0 this.modifyGridPop = false this.getAgencyList() this.getDepartmentList() From e1fa541b6a4faec988a28bbfed077fc642ce03b6 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 9 Aug 2022 14:19:13 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=80=E5=B0=8F?= =?UTF-8?q?=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/organization/organization.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index 7e170800e..6ebc53925 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -792,7 +792,7 @@ - + @@ -1588,7 +1588,7 @@ export default { this.modifyGridFrom.gridType = '', this.modifyGridFrom.manageDistrict = '', this.modifyGridFrom.griId = '' - this.modifyGridFrom.gridSort = 0 + }, // 社区新增弹框取消按钮 cancel () { From 5afe8a5ad1f8603415ed2bcd2fde182d40310b2d Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 9 Aug 2022 14:25:05 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=9C=80=E5=B0=8F=E4=B8=BA1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/organization/organization.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index 6ebc53925..260ee6575 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -792,7 +792,7 @@ - +