From 395e8c1071cc1aa5077f4d69908c121ae6b3d06e Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 24 Sep 2020 20:10:00 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90grid=E4=BF=AE=E6=94=B9=E3=80=91-?= =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-09-24?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/user/alluser.vue | 14 ++++++------- .../modules/user/fail-authentication.vue | 18 ++++++++--------- .../user/hasAuthenticationpartymembers.vue | 18 ++++++++--------- src/views/modules/user/party-review.vue | 2 +- .../user/party-wait-authentication.vue | 16 +++++++-------- .../user/partymembers-add-or-update.vue | 12 +++++------ src/views/modules/user/partymembers.vue | 18 ++++++++--------- .../modules/user/pass-authentication.vue | 16 +++++++-------- src/views/modules/user/user-add-or-update.vue | 8 ++++---- src/views/modules/user/user-detail.vue | 8 ++++---- src/views/modules/user/user-grid.vue | 4 ++-- src/views/modules/user/user.vue | 20 +++++++++---------- .../user/volunteerinfo-add-or-update.vue | 6 +++--- src/views/modules/user/volunteerinfo.vue | 10 +++++----- .../modules/user/wait-authentication.vue | 16 +++++++-------- 15 files changed, 93 insertions(+), 93 deletions(-) diff --git a/src/views/modules/user/alluser.vue b/src/views/modules/user/alluser.vue index c2cc592..476360f 100644 --- a/src/views/modules/user/alluser.vue +++ b/src/views/modules/user/alluser.vue @@ -158,7 +158,7 @@ export default { id: '', nickname: '', identityNo: '', - gridId: '', + deptId: '', realName: '', mobile: '', startTime: '', @@ -210,22 +210,22 @@ export default { if (val.length === 0) { this.dataForm.streetId = '' this.dataForm.communityId = '' - this.dataForm.gridId = '' + this.dataForm.deptId = '' } if (val.length === 1) { this.dataForm.streetId = this.deptIdList[0] this.dataForm.communityId = '' - this.dataForm.gridId = '' + this.dataForm.deptId = '' } if (val.length === 2) { this.dataForm.streetId = this.deptIdList[0] this.dataForm.communityId = this.deptIdList[1] - this.dataForm.gridId = '' + this.dataForm.deptId = '' } if (val.length === 3) { this.dataForm.streetId = this.deptIdList[0] this.dataForm.communityId = this.deptIdList[1] - this.dataForm.gridId = this.deptIdList[2] + this.dataForm.deptId = this.deptIdList[2] } } }, @@ -240,7 +240,7 @@ export default { }, getCommunityList () { this.communityOptions = this.gridOptions = [] - this.dataForm.communityId = this.dataForm.gridId = null + this.dataForm.communityId = this.dataForm.deptId = null if (this.dataForm.streetId) { this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => { if (res.code !== 0) { @@ -252,7 +252,7 @@ export default { }, getGridList () { this.gridOptions = [] - this.dataForm.gridId = null + this.dataForm.deptId = null if (this.dataForm.communityId) { this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => { if (res.code !== 0) { diff --git a/src/views/modules/user/fail-authentication.vue b/src/views/modules/user/fail-authentication.vue index 4883668..a7762d5 100644 --- a/src/views/modules/user/fail-authentication.vue +++ b/src/views/modules/user/fail-authentication.vue @@ -36,9 +36,9 @@ :value="item.id"> - - { if (res.code !== 0) { @@ -312,7 +312,7 @@ export default { }, getGridList () { this.gridOptions = [] - this.dataForm.gridId = null + this.dataForm.deptId = null if (this.dataForm.communityId) { this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => { if (res.code !== 0) { diff --git a/src/views/modules/user/hasAuthenticationpartymembers.vue b/src/views/modules/user/hasAuthenticationpartymembers.vue index 3ad186a..ccf2e8c 100644 --- a/src/views/modules/user/hasAuthenticationpartymembers.vue +++ b/src/views/modules/user/hasAuthenticationpartymembers.vue @@ -168,7 +168,7 @@ export default { streetId: '', identityNo: '', communityId: '', - gridId: '', + deptId: '', registFlag: '', postId: '', startTime: '', @@ -210,22 +210,22 @@ export default { if (val.length === 0) { this.dataForm.streetId = '' this.dataForm.communityId = '' - this.dataForm.gridId = '' + this.dataForm.deptId = '' } if (val.length === 1) { this.dataForm.streetId = this.deptIdList[0] this.dataForm.communityId = '' - this.dataForm.gridId = '' + this.dataForm.deptId = '' } if (val.length === 2) { this.dataForm.streetId = this.deptIdList[0] this.dataForm.communityId = this.deptIdList[1] - this.dataForm.gridId = '' + this.dataForm.deptId = '' } if (val.length === 3) { this.dataForm.streetId = this.deptIdList[0] this.dataForm.communityId = this.deptIdList[1] - this.dataForm.gridId = this.deptIdList[2] + this.dataForm.deptId = this.deptIdList[2] } } }, @@ -298,11 +298,11 @@ export default { this.communityOptions = [] this.gridOptions = [] this.dataForm.communityId = '' - this.dataForm.gridId = '' + this.dataForm.deptId = '' return } this.dataForm.communityId = '' - this.dataForm.gridId = '' + this.dataForm.deptId = '' this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) @@ -313,10 +313,10 @@ export default { getGridList () { if (this.dataForm.communityId === '') { this.gridOptions = [] - this.dataForm.gridId = '' + this.dataForm.deptId = '' return } - this.dataForm.gridId = '' + this.dataForm.deptId = '' this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) diff --git a/src/views/modules/user/party-review.vue b/src/views/modules/user/party-review.vue index f135a0a..10f7afd 100644 --- a/src/views/modules/user/party-review.vue +++ b/src/views/modules/user/party-review.vue @@ -61,7 +61,7 @@ - - { if (res.code !== 0) { @@ -311,7 +311,7 @@ export default { }, getGridList () { this.gridOptions = [] - this.dataForm.gridId = null + this.dataForm.deptId = null if (this.dataForm.communityId) { this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => { if (res.code !== 0) { diff --git a/src/views/modules/user/partymembers-add-or-update.vue b/src/views/modules/user/partymembers-add-or-update.vue index 1ded547..5fe9bc1 100644 --- a/src/views/modules/user/partymembers-add-or-update.vue +++ b/src/views/modules/user/partymembers-add-or-update.vue @@ -55,7 +55,7 @@ - item.id === this.dataForm.streetId)[0] // this.dataForm.streetName = choosenItem.name // this.dataForm.communityId = '' - // this.dataForm.gridId = '' + // this.dataForm.deptId = '' // this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => { // if (res.code !== 0) { // return this.$message.error(res.msg) @@ -199,7 +199,7 @@ export default { // getGridList () { // let choosenItem = this.communityOptions.filter(item => item.id === this.dataForm.communityId)[0] // this.dataForm.communityName = choosenItem.name - // this.dataForm.gridId = '' + // this.dataForm.deptId = '' // this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => { // if (res.code !== 0) { // return this.$message.error(res.msg) @@ -208,8 +208,8 @@ export default { // }).catch(() => { }) // }, evaluation () { - let choosenItem = this.gridOptions.filter(item => item.id === this.dataForm.gridId)[0] - this.dataForm.gridName = choosenItem.name + let choosenItem = this.gridOptions.filter(item => item.id === this.dataForm.deptId)[0] + this.dataForm.deptName = choosenItem.name }, // 获取信息 getInfo () { diff --git a/src/views/modules/user/partymembers.vue b/src/views/modules/user/partymembers.vue index 2a4781d..6e64c72 100644 --- a/src/views/modules/user/partymembers.vue +++ b/src/views/modules/user/partymembers.vue @@ -244,7 +244,7 @@ export default { streetId: '', identityNo: '', communityId: '', - gridId: '', + deptId: '', registFlag: '', postId: '', startTime: '', @@ -303,22 +303,22 @@ export default { if (val.length === 0) { this.dataForm.streetId = '' this.dataForm.communityId = '' - this.dataForm.gridId = '' + this.dataForm.deptId = '' } if (val.length === 1) { this.dataForm.streetId = this.deptIdList[0] this.dataForm.communityId = '' - this.dataForm.gridId = '' + this.dataForm.deptId = '' } if (val.length === 2) { this.dataForm.streetId = this.deptIdList[0] this.dataForm.communityId = this.deptIdList[1] - this.dataForm.gridId = '' + this.dataForm.deptId = '' } if (val.length === 3) { this.dataForm.streetId = this.deptIdList[0] this.dataForm.communityId = this.deptIdList[1] - this.dataForm.gridId = this.deptIdList[2] + this.dataForm.deptId = this.deptIdList[2] } } }, @@ -384,11 +384,11 @@ export default { this.communityOptions = [] this.gridOptions = [] this.dataForm.communityId = '' - this.dataForm.gridId = '' + this.dataForm.deptId = '' return } this.dataForm.communityId = '' - this.dataForm.gridId = '' + this.dataForm.deptId = '' this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) @@ -399,10 +399,10 @@ export default { getGridList () { if (this.dataForm.communityId === '') { this.gridOptions = [] - this.dataForm.gridId = '' + this.dataForm.deptId = '' return } - this.dataForm.gridId = '' + this.dataForm.deptId = '' this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) diff --git a/src/views/modules/user/pass-authentication.vue b/src/views/modules/user/pass-authentication.vue index 39e27c1..13f4140 100644 --- a/src/views/modules/user/pass-authentication.vue +++ b/src/views/modules/user/pass-authentication.vue @@ -38,7 +38,7 @@ - { if (res.code !== 0) { @@ -306,7 +306,7 @@ export default { }, getGridList () { this.gridOptions = [] - this.dataForm.gridId = null + this.dataForm.deptId = null if (this.dataForm.communityId) { this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => { if (res.code !== 0) { diff --git a/src/views/modules/user/user-add-or-update.vue b/src/views/modules/user/user-add-or-update.vue index 7830b87..4fdc9fd 100644 --- a/src/views/modules/user/user-add-or-update.vue +++ b/src/views/modules/user/user-add-or-update.vue @@ -88,15 +88,15 @@ width="180" v-if="false"> - --> - - + --> @@ -68,8 +68,8 @@ - + - +