diff --git a/src/views/components/resiChangeRecord.vue b/src/views/components/resiChangeRecord.vue index 20066386..58722bdb 100644 --- a/src/views/components/resiChangeRecord.vue +++ b/src/views/components/resiChangeRecord.vue @@ -26,7 +26,7 @@ label="变更前" width="230"> - @@ -153,7 +153,10 @@ export default { eduTotalCount: 0, propTree: [], value2: '', + visibleAgeLoading: true, visibleLoading: true, + agencyId: '', + orgType: '', pageNo: 1, pageSize: 10, agePageNo: 1, @@ -596,6 +599,7 @@ export default { } } }) + this.ageTotalCount = 0 data.forEach(item => { this.ageTotalCount += Number(item.value) }) @@ -618,6 +622,7 @@ export default { isClick: false } }) + this.eduTotalCount = 0 data.forEach(item => { this.eduTotalCount += Number(item.value) }) @@ -627,7 +632,7 @@ export default { }, async getAgeList(orgId, orgType, _code) { - this.visibleLoading = true + this.visibleAgeLoading = true const url = "/epmetuser/icresiuser/partymemberagelist"; let params = { orgId, @@ -649,9 +654,10 @@ export default { this.$message.error(msg) } // if (_code == 0 || _code) this.noInit = true - this.visibleLoading = false + this.visibleAgeLoading = false }, async getEduList(orgId, orgType, _code) { + this.visibleLoading = true const url = "/epmetuser/icresiuser/partymembereducationlist"; let params = { orgId, @@ -672,6 +678,7 @@ export default { } else { this.$message.error(msg) } + this.visibleLoading = false }, async getAgencyList(node, resolve) { // const url = "/gov/org/customeragency/staffinagencylist"; @@ -683,6 +690,8 @@ export default { if (code === 0) { console.log('data-org----o', data) this.selectAgency = [`${data.agencyId}-${data.level}`] + this.orgType = data.level + this.agencyId = data.agencyId let arr = [] arr.push(data) this.propTree = arr && this.getTreeData(arr) @@ -728,6 +737,12 @@ export default { console.log('val-vvv', val) const _arr = val[val.length - 1].split('-') const orgType = _arr[1] !== 'grid' ? 'agency': 'grid' + this.agencyId = _arr[0] + this.orgType = orgType + this.noInit = false + this.noEduInit = false + this.getAgeCount(_arr[0], orgType) + this.getEduCount(_arr[0], orgType) this.getAgeList(_arr[0], orgType) this.getEduList(_arr[0], orgType) }, @@ -742,20 +757,20 @@ export default { pageSizeChangeHandleAge(val) { this.agePageNo = 1 this.agePageSize = val - this.getAgeList() + this.getAgeList(this.agencyId, this.orgType) }, pageCurrentChangeHandleAge (val) { this.agePageSize = val - this.getAgeList() + this.getAgeList(this.agencyId, this.orgType) }, pageSizeChangeHandleNew(val) { this.pageNo = 1; this.pageSize = val; - this.getEduList() + this.getEduList(this.agencyId, this.orgType) }, pageCurrentChangeHandleNew(val) { this.pageNo = val; - this.getEduList() + this.getEduList(this.agencyId, this.orgType) }, }, };