diff --git a/src/views/main-shuju/main.vue b/src/views/main-shuju/main.vue index 8d4f0bc2c..4abb6808f 100644 --- a/src/views/main-shuju/main.vue +++ b/src/views/main-shuju/main.vue @@ -123,7 +123,7 @@ export default { localStorage.setItem("customerName", data.customerName || ""); } } else { - this.$message.error(rspMsg); + this.$message.error(msg); } }, }, diff --git a/src/views/main.vue b/src/views/main.vue index f12112f35..eb6f306e1 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -159,7 +159,7 @@ export default { localStorage.setItem("customerName", data.customerName || ""); } } else { - this.$message.error(rspMsg); + this.$message.error(msg); } }, }, diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue index 30fdeb7da..743389e5e 100644 --- a/src/views/modules/base/collect.vue +++ b/src/views/modules/base/collect.vue @@ -42,6 +42,15 @@ value-format="yyyy-MM-dd"> + + + + + + + + + + + + + + { + if(resp.data.code === 0){ + this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data) + } + }).catch(error => { + this.$message.error(error) + }) + }, + removeEmptySubOrgList (orgArray) { + orgArray.forEach((orgInfo) => { + if (orgInfo && orgInfo.children) { + if (orgInfo.children.length === 0) { + orgInfo.children = undefined + } else { + this.removeEmptySubOrgList(orgInfo.children) + } + } + }) + return orgArray; + }, + handlePartyChange(val) { + console.log('val------pp', val) + this.dataForm.gridId = val[val.length - 1] + }, + }, +created(){ + this.getloudongOptions() + }, components: { AddOrUpdate, }, diff --git a/src/views/modules/cabaseinfo/capingfang.vue b/src/views/modules/cabaseinfo/capingfang.vue index 694043076..e6f3a1b52 100644 --- a/src/views/modules/cabaseinfo/capingfang.vue +++ b/src/views/modules/cabaseinfo/capingfang.vue @@ -2,6 +2,14 @@
+ + + + + + + + + + { + if(resp.data.code === 0){ + this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data) + } + }).catch(error => { + this.$message.error(error) + }) + }, + removeEmptySubOrgList (orgArray) { + orgArray.forEach((orgInfo) => { + if (orgInfo && orgInfo.children) { + if (orgInfo.children.length === 0) { + orgInfo.children = undefined + } else { + this.removeEmptySubOrgList(orgInfo.children) + } + } + }) + return orgArray; + }, + handlePartyChange(val) { + console.log('val------pp', val) + this.dataForm.gridId = val[val.length - 1] + }, + }, +created(){ + this.getloudongOptions() + }, components: { AddOrUpdate, }, diff --git a/src/views/modules/cabaseinfo/carental.vue b/src/views/modules/cabaseinfo/carental.vue index 0980e8039..9392fa23e 100644 --- a/src/views/modules/cabaseinfo/carental.vue +++ b/src/views/modules/cabaseinfo/carental.vue @@ -2,6 +2,14 @@
+ + + + + + + + + + { + if(resp.data.code === 0){ + this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data) + } + }).catch(error => { + this.$message.error(error) + }) + }, + removeEmptySubOrgList (orgArray) { + orgArray.forEach((orgInfo) => { + if (orgInfo && orgInfo.children) { + if (orgInfo.children.length === 0) { + orgInfo.children = undefined + } else { + this.removeEmptySubOrgList(orgInfo.children) + } + } + }) + return orgArray; + }, + handlePartyChange(val) { + console.log('val------pp', val) + this.dataForm.gridId = val[val.length - 1] + }, + }, +created(){ + this.getloudongOptions() + }, components: { AddOrUpdate, }, diff --git a/src/views/modules/cabaseinfo/caresident.vue b/src/views/modules/cabaseinfo/caresident.vue index 0cba7cd8b..8b91e76aa 100644 --- a/src/views/modules/cabaseinfo/caresident.vue +++ b/src/views/modules/cabaseinfo/caresident.vue @@ -2,6 +2,14 @@
+ + + + @@ -44,6 +52,27 @@ align="center" width="50" > + + + + + + { + if(resp.data.code === 0){ + this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data) + } + }).catch(error => { + this.$message.error(error) + }) + }, + removeEmptySubOrgList (orgArray) { + orgArray.forEach((orgInfo) => { + if (orgInfo && orgInfo.children) { + if (orgInfo.children.length === 0) { + orgInfo.children = undefined + } else { + this.removeEmptySubOrgList(orgInfo.children) + } + } + }) + return orgArray; + }, + handlePartyChange(val) { + console.log('val------pp', val) + this.dataForm.gridId = val[val.length - 1] + }, + }, +created(){ + this.getloudongOptions() + }, components: { AddOrUpdate, }, diff --git a/src/views/modules/cabaseinfo/carotators.vue b/src/views/modules/cabaseinfo/carotators.vue index c171dad8d..f6068f2b5 100644 --- a/src/views/modules/cabaseinfo/carotators.vue +++ b/src/views/modules/cabaseinfo/carotators.vue @@ -2,6 +2,14 @@
+ + + + @@ -44,6 +52,27 @@ align="center" width="50" > + + + + + + { + if(resp.data.code === 0){ + this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data) + } + }).catch(error => { + this.$message.error(error) + }) + }, + removeEmptySubOrgList (orgArray) { + orgArray.forEach((orgInfo) => { + if (orgInfo && orgInfo.children) { + if (orgInfo.children.length === 0) { + orgInfo.children = undefined + } else { + this.removeEmptySubOrgList(orgInfo.children) + } + } + }) + return orgArray; + }, + handlePartyChange(val) { + console.log('val------pp', val) + this.dataForm.gridId = val[val.length - 1] + }, + }, +created(){ + this.getloudongOptions() + }, components: { AddOrUpdate, }, diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue index 04bbde23e..93c020d7c 100644 --- a/src/views/modules/partymember/icpartyorg-add-or-update.vue +++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue @@ -145,12 +145,6 @@ agencyOrgList:[] } }, - // mounted () { - // setTimeout(() => { - // console.log(':::::::::::::::::::::::') - // this.initMap() - // }, 800); - // }, methods: { init() { this.visible = true @@ -159,10 +153,10 @@ this.dataForm.staffId = localStorage.getItem('staffId') this.keyWords = '' //设置党组织类型 - - this.$nextTick(() => { + setTimeout(() => { this.$refs['dataForm'].resetFields() this.dataForm.latitude = '' + this.dataForm.agencyId = '' if (this.dataForm.id) { this.setPartyOrgType() this.getInfo() @@ -174,14 +168,17 @@ this.dataForm.orgPid = this.dataForm.orgId this.dataForm.orgPids = this.dataForm.orgPids ? this.dataForm.orgPids + ':' + this.dataForm.orgId : this.dataForm.orgId this.dataForm.partyOrgType = this.dataForm._partyOrgType - console.log(this.dataForm.partyOrgType, this.dataForm.orgPid, this.dataForm.orgPids) + this.setPartyOrgType_xzxj() this.getInfoAgencyLisy() } else { this.dataForm.mySelectOrg = '' } } - }) + }, 50); + // this.$nextTick(() => { + + // }) }, // 设置组织类型 新增党组织 setPartyOrgType_xzxj() { @@ -250,9 +247,22 @@ if(value == '5'){ // 支部 不选择行政组织 this.dataForm.agencyId = localStorage.getItem('agencyId') this.dataForm.agencyPids = '' + // 先清空数据 + this.orgList = [] + this.dataForm.mySelectOrg = '', // 我选中的当前党组织 + this.dataForm.orgPid = '', // 党组织的上级ID,没有上级时为0 + this.dataForm.orgPids = '' this.getOrgList() } else { - //根据组织类型获取行政组织 + // 先清空数据 + this.agencyOrgList = [] + this.dataForm.agencyId = '' + + // 先清空数据 + this.orgList = [] + this.dataForm.mySelectOrg = '', // 我选中的当前党组织 + this.dataForm.orgPid = '', // 党组织的上级ID,没有上级时为0 + this.dataForm.orgPids = '' this.getInfoAgencyLisy() } }, diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue index b7935dd09..776585349 100644 --- a/src/views/modules/partymember/icpartyorgtree.vue +++ b/src/views/modules/partymember/icpartyorgtree.vue @@ -1,5 +1,5 @@