diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index e287fa9ad..288b75729 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -1183,7 +1183,8 @@ export default { oldSubsidy:''//高龄补助 }, specialDto:{//特殊人群 - specialCategoryCode:[]//人群类别【字典表】,可多选，以英文逗号隔开； + id:'',//人群类别【字典表】,可多选，以英文逗号隔开； + specialCategoryCode:[] }, birthRecordDTO:{ birthplace: '', @@ -1428,7 +1429,7 @@ export default { }, async getResidentNation(){ try { - const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'resident_category'}) + const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'special_resident_category'}) this.footerInputList.forEach(c => { for(let i of c.children){ if(i.formName == 'specialCategoryCode'){ @@ -1617,103 +1618,106 @@ export default { this.getHouseList() }, async handleClick (tab, event) { - if (event.toElement.innerText == '教育') { + console.log(tab); + console.log(event); + console.log(tab._props.label ); + if (tab._props.label == '教育') { if (!this.form.resiId) { this.newForm.eduInfoDto = this.form.eduInfoDto } else { await this.residentEduInfo(this.form.resiId) } - } else if (event.toElement.innerText == '兴趣爱好') { + } else if (tab._props.label == '兴趣爱好') { if (!this.form.resiId) { this.newForm.hobbyInfoDto = this.form.hobbyInfoDto } else { await this.residentHobbyInfo(this.form.resiId) } - } else if (event.toElement.innerText == '宗教信仰') { + } else if (tab._props.label == '宗教信仰') { if (!this.form.resiId) { this.newForm.religionDto = this.form.religionDto } else { await this.residentReligion(this.form.resiId) } - } else if (event.toElement.innerText == '健康') { + } else if (tab._props.label == '健康') { if (!this.form.resiId) { this.newForm.healthDto = this.form.healthDto } else { await this.getHealthInfoDetailById(this.form.resiId) } - } else if (event.toElement.innerText == '工作') { + } else if (tab._props.label == '工作') { if (!this.form.resiId) { this.newForm.workInfoDto = this.form.workInfoDto } else { await this.residentWorkInfo(this.form.resiId) } - } else if (event.toElement.innerText == '经济情况') { + } else if (tab._props.label == '经济情况') { if (!this.form.resiId) { this.newForm.economyDto = this.form.economyDto } else { await this.getEconomyDetailById(this.form.resiId) } - } else if (event.toElement.innerText == '居住') { + } else if (tab._props.label == '居住') { if (!this.form.resiId) { this.newForm.resideInfoDto = this.form.resideInfoDto } else { await this.getResideInfoDetailById(this.form.resiId) } - } else if (event.toElement.innerText == '家庭') { + } else if (tab._props.label == '家庭') { if (!this.form.resiId) { this.newForm.familyInfoDto = this.form.familyInfoDto } else { await this.getFamilyInfoDetailById(this.form.resiId) } - } else if (event.toElement.innerText == '出生人员') { + } else if (tab._props.label == '出生人员') { if (!this.form.resiId) { this.newForm.birthRecordDTO = this.form.birthRecordDTO } else { await this.residentBirthRecord(this.form.resiId) } - } else if (event.toElement.innerText == '党员信息') { + } else if (tab._props.label == '党员信息') { if (!this.form.resiId) { this.newForm.parymemberInfoDto = this.form.parymemberInfoDto } else { await this.residentPartyMemberInfo(this.form.resiId) } - } else if (event.toElement.innerText == '保障房信息') { + } else if (tab._props.label == '保障房信息') { if (!this.form.resiId) { this.newForm.ensureHouseDto = this.form.ensureHouseDto } else { await this.residentEnsureHouse(this.form.resiId) } - } else if (event.toElement.innerText == '失业') { + } else if (tab._props.label == '失业') { if (!this.form.resiId) { this.newForm.unemployedDto = this.form.unemployedDto } else { await this.residentUnemployed(this.form.resiId) } - } else if (event.toElement.innerText == '退役军人') { + } else if (tab._props.label == '退役军人') { if (!this.form.resiId) { this.newForm.veteranDto = this.form.veteranDto } else { await this.getVeteranDetailById(this.form.resiId) } - } else if (event.toElement.innerText == '统战') { + } else if (tab._props.label == '统战') { if (!this.form.resiId) { this.newForm.unitedFrontDto = this.form.unitedFrontDto } else { await this.residentUnitedFront(this.form.resiId) } - } else if (event.toElement.innerText == '志愿者信息') { + } else if (tab._props.label == '志愿者信息') { if (!this.form.resiId) { this.newForm.volunteerDto = this.form.volunteerDto } else { await this.getVolunteerDetailById(this.form.resiId) } - } else if (event.toElement.innerText == '特殊人群') { + } else if (tab._props.label == '特殊人群') { if (!this.form.resiId) { this.newForm.specialDto = this.form.specialDto } else { await this.residentSpecial(this.form.resiId) } - } else if (event.toElement.innerText == '老年人') { + } else if (tab._props.label == '老年人') { if (!this.form.resiId) { this.newForm.oldPeopleDto = this.form.oldPeopleDto } else { @@ -2311,6 +2315,8 @@ export default { } this.newForm.eduInfoDto = this.form.eduInfoDto + this.newForm.specialDto = this.form.specialDto + console.log(this.newForm.specialDto); }, setJSON() { this.newForm.agencyName = this.form.agencyName, @@ -2408,8 +2414,7 @@ export default { if(this.newForm.oldPeopleDto) { this.newForm.oldPeopleDto = this.form.oldPeopleDto } - - if(this.newForm.specialDto) { + if(this.newForm.specialDto){ this.newForm.specialDto = this.form.specialDto } } diff --git a/src/views/components/resiInfo.vue b/src/views/components/resiInfo.vue index 29d09b704..276a376be 100644 --- a/src/views/components/resiInfo.vue +++ b/src/views/components/resiInfo.vue @@ -1201,6 +1201,7 @@ export default { }else if(tab.index == 14){ this.getOldPeopleDetailById() }else if(tab.index == 15){ + console.log(1); this.getResidentNation() this.getresidentSpecial() }else if(tab.index == 16){ @@ -1424,7 +1425,7 @@ export default { }}, async getResidentNation(){ try { - const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'resident_category'}) + const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'special_resident_category'}) this.specialDtoArr=data.data } catch (error) { console.log(error,'获取特殊人群字典'); diff --git a/src/views/modules/base/community/communityExportInfo.vue b/src/views/modules/base/community/communityExportInfo.vue index 46244d31e..bc75c4cc1 100644 --- a/src/views/modules/base/community/communityExportInfo.vue +++ b/src/views/modules/base/community/communityExportInfo.vue @@ -335,7 +335,7 @@ export default { searchForm: { ...this.search }, exportConfig: { ...this.form, - formCode: 'resi_base_info', + formCode: 'community_info', itemList: this.rightList.map(item => { return { itemId: item.id, @@ -430,19 +430,11 @@ export default { const { data, code, msg } = await requestPost(url, params) if (code === 0) { - data.forEach((item) => { - (async (id) => { - // item.queryItemList = await this.getExportChildList(id) - item.queryItemList = []; - })(item.id); - }); - this.exportList = [...data]; - this.$nextTick(() => { - this.diyDialog = true; - }); - console.log("获取详情成功getExportList----", this.exportList); + + return data + } else { - this.$message.error(msg); + this.$message.error(msg) } // if (code === 0) { // let dataTemp = [] diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index f39d86c2e..ad96eefe5 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -310,7 +310,7 @@ ref="ref_diy" :list="exportList" :search="{ - formCode: 'resi_base_info', + formCode: 'community_info', pageNo: pageNo, pageSize: pageSize, conditions: conditions, diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index ee147198a..29f223fc7 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -1,45 +1,9 @@