diff --git a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue index 6ac74f3d..c785eae2 100644 --- a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue +++ b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue @@ -4,13 +4,28 @@ - + clearable /> --> + @@ -44,13 +59,14 @@ - + @@ -237,7 +253,7 @@ }, // 获取党组织列表 getOrgList() { - return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: localStorage.getItem('agencyId')}}).then(({data: res}) => { + return this.$http.get('/resi/partymember/icPartyOrg/getSearchTreelist', {params: {agencyId: localStorage.getItem('agencyId')}}).then(({data: res}) => { if (res.code !== 0) { return this.$message.error(res.msg) } diff --git a/src/views/modules/partymember/icpartymemberpoint.vue b/src/views/modules/partymember/icpartymemberpoint.vue index 6180d89c..310d1e32 100644 --- a/src/views/modules/partymember/icpartymemberpoint.vue +++ b/src/views/modules/partymember/icpartymemberpoint.vue @@ -10,8 +10,9 @@ > @@ -241,17 +244,27 @@ export default { this.currentPage = val this.getDataList() }, + deepArrTOnull(arr) { + let a = [] + a = arr.map(item => { + return { + ...item, + children: (item.children.length > 0 && this.deepArrTOnull(item.children) )|| null + } + }) + return a + }, // 获取党组织列表 getOrgList() { return this.$http - .get('/resi/partymember/icPartyOrg/getTreelist', { + .get('/resi/partymember/icPartyOrg/getSearchTreelist', { params: { agencyId: localStorage.getItem('agencyId') } }) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } - this.orgList = res.data + this.orgList = this.deepArrTOnull(res.data) }) .catch(() => {}) }, diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue index 3309ae0b..49a84ac4 100644 --- a/src/views/modules/visual/communityParty/party.vue +++ b/src/views/modules/visual/communityParty/party.vue @@ -753,7 +753,8 @@ export default { async getPartyOggList(node, resolve) { // const url = "/gov/org/customeragency/staffinagencylist"; // const url = '/gov/org/customeragency/agencygridtree' - const url = '/resi/partymember/icPartyOrg/getTreelist' + // const url = '/resi/partymember/icPartyOrg/getTreelist' + const url ='/resi/partymember/icPartyOrg/getSearchTreelist' let params = { agencyId: this.$store.state.user.agencyId, };