From 14bddbc942195886a7a8895d530a3bc8c733ca68 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Wed, 25 May 2022 10:37:11 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/partymember/icpartyorg-add-or-update.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue index aaa091841..bfa352579 100644 --- a/src/views/modules/partymember/icpartyorg-add-or-update.vue +++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue @@ -42,6 +42,7 @@ placeholder="请选择上级党组织" :props="{ checkStrictly: true, label: 'partyOrgName', value: 'id', children: 'children' }" @change="handleChangeOrg" + :disabled="dataForm.id ? true : false" clearable /> From 6cdaa085171aec80163392b09703420e550a3026 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Wed, 25 May 2022 11:19:01 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/icpartyorg-add-or-update.vue | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue index bfa352579..d141b251b 100644 --- a/src/views/modules/partymember/icpartyorg-add-or-update.vue +++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue @@ -48,7 +48,7 @@ -
@@ -71,7 +71,7 @@
- @@ -309,7 +309,7 @@ document.getElementById('app').innerHTML = '' if (document.getElementById('app')) { document.getElementById('mapSeach_id').style.display = "block" - document.getElementById('lon_lat_id').style.display = "block" + // document.getElementById('lon_lat_id').style.display = "block" } // 定义地图中心点坐标 @@ -417,6 +417,9 @@ }, // 表单提交 dataFormSubmitHandle: debounce(function () { + if (!this.dataForm.latitude || !this.dataForm.longitude) { + return this.$message.error('请滑动地图选择党组织位置') + } this.$refs['dataForm'].validate((valid) => { if (!valid) { return false @@ -451,13 +454,6 @@ partyOrgType: [ {required: true, message: this.$t('validate.required'), trigger: 'blur'} ], - - longitude: [ - {required: true, message: this.$t('validate.required'), trigger: 'blur'} - ], - latitude: [ - {required: true, message: this.$t('validate.required'), trigger: 'blur'} - ], agencyId: [ {required: true, message: this.$t('validate.required'), trigger: 'blur'} ] From 9d0dc2ad6e4d8a933b20d5374a8a0862121b4d4f Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 25 May 2022 15:51:19 +0800 Subject: [PATCH 3/5] dd --- src/views/modules/communityParty/members/cpts/record.vue | 6 ++---- src/views/modules/communityParty/members/index.vue | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/views/modules/communityParty/members/cpts/record.vue b/src/views/modules/communityParty/members/cpts/record.vue index bfc176bd1..4236f0e88 100644 --- a/src/views/modules/communityParty/members/cpts/record.vue +++ b/src/views/modules/communityParty/members/cpts/record.vue @@ -80,7 +80,7 @@ class="btn-color-edit" >取消 - + --> diff --git a/src/views/modules/communityParty/members/index.vue b/src/views/modules/communityParty/members/index.vue index b0ce18dc8..eb49b55fc 100644 --- a/src/views/modules/communityParty/members/index.vue +++ b/src/views/modules/communityParty/members/index.vue @@ -490,7 +490,7 @@ export default { } }, - handleTimeChangePay (timvale) { + handleTimeChangePay (val) { if (val.length > 0) { this.searchForm.payStatrDate = val[0] this.searchForm.payEndDate = val[0] From 7c96a8692cba557c0387b1f2768a1cc856d27bb9 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Wed, 25 May 2022 16:29:45 +0800 Subject: [PATCH 4/5] bug --- .../partymember/icpartyorg-add-or-update.vue | 20 +++---- .../modules/partymember/icpartyorgtree.vue | 10 ++-- src/views/modules/partymember/lookMember.vue | 53 ++++++++++++++++--- 3 files changed, 62 insertions(+), 21 deletions(-) diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue index d141b251b..a36f8633c 100644 --- a/src/views/modules/partymember/icpartyorg-add-or-update.vue +++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue @@ -160,8 +160,8 @@ this.getInfo() } else { this.initMap() - if(this.dataForm.orgPids) { - this.dataForm.mySelectOrg = this.dataForm.orgPids.split(':') + if(this.dataForm.id) { + this.dataForm.mySelectOrg = this.dataForm.id } else { this.dataForm.mySelectOrg = '' } @@ -221,7 +221,7 @@ } this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType', {params: {agencyId: this.agencyId, orgType:value}}).then(({data: res}) => { if (res.code !== 0) { - return this.$message.error(res.msg) + return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败') } this.agencyOrgList = this.removeEmptyChildren(res.data) }).catch(() => {}) @@ -230,8 +230,8 @@ getOrgList() { return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: this.agencyId}}).then(({data: res}) => { if (res.code !== 0) { - return this.$message.error(res.msg) - } + return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败') + } this.orgList = this.removeEmptyChildren(res.data) this.orgList.unshift({ partyOrgName: '一级组织', @@ -269,14 +269,16 @@ getInfo() { this.$http.get(`/resi/partymember/icPartyOrg/${this.dataForm.id}`).then(({data: res}) => { if (res.code !== 0) { - return this.$message.error(res.msg) + return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败') } this.dataForm = { ...this.dataForm, ...res.data } // 党组织组织 - this.dataForm.mySelectOrg = this.dataForm.orgPids.split(':') + this.dataForm.mySelectOrg = this.dataForm.id + // this.dataForm.mySelectOrg.push(this.dataForm.id) + console.log(JSON.stringify(this.dataForm.mySelectOrg)) // 行政组织 this.dataForm.agencyId = this.dataForm.agencyId this.initMap() @@ -293,7 +295,7 @@ orgType:this.dataForm.partyOrgType} }).then(({data: res}) => { if (res.code !== 0) { - return this.$message.error(res.msg) + return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败') } this.agencyOrgList = res.data }).catch(() => { @@ -426,7 +428,7 @@ } this.$http[!this.dataForm.id ? 'post' : 'put']('/resi/partymember/icPartyOrg/', this.dataForm).then(({data: res}) => { if (res.code !== 0) { - return this.$message.error(res.msg) + return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败') } this.$message({ message: this.$t('prompt.success'), diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue index ea30b4400..3a62fb75f 100644 --- a/src/views/modules/partymember/icpartyorgtree.vue +++ b/src/views/modules/partymember/icpartyorgtree.vue @@ -19,7 +19,7 @@