diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue index d141b251..a36f8633 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 ea30b440..3a62fb75 100644 --- a/src/views/modules/partymember/icpartyorgtree.vue +++ b/src/views/modules/partymember/icpartyorgtree.vue @@ -19,7 +19,7 @@