From f370310ed983164d67bfa4ab575fb1e47676bb3b Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 14 Feb 2023 10:30:39 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=87=AA=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/community/communityExportInfo.vue | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/views/modules/base/community/communityExportInfo.vue b/src/views/modules/base/community/communityExportInfo.vue index 46244d31e..63ed4d6c8 100644 --- a/src/views/modules/base/community/communityExportInfo.vue +++ b/src/views/modules/base/community/communityExportInfo.vue @@ -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 = [] From 5e00f4bb97e177e1f72dd33c60229d0a7897338a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 14 Feb 2023 10:36:41 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=88=86=E5=BC=80=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/community/communityExportInfo.vue | 2 +- src/views/modules/base/community/communityTable.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/base/community/communityExportInfo.vue b/src/views/modules/base/community/communityExportInfo.vue index 63ed4d6c8..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, 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, From 8dab50f02fa8663ff11860a41a0dccbe9d4b20c8 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 14 Feb 2023 16:32:52 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E4=BA=BA=E7=BE=A4?= =?UTF-8?q?=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index e287fa9ad..d5fe9bf73 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -1428,7 +1428,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'){ From d4255a1ca4a809b5997a037d22b0799d2764f3b1 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Wed, 15 Feb 2023 08:43:03 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E4=BA=BA=E7=BE=A4?= =?UTF-8?q?=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiForm.vue | 8 ++-- src/views/components/resiInfo.vue | 3 +- src/views/modules/base/resi.vue | 76 ++++++++++++------------------- 3 files changed, 37 insertions(+), 50 deletions(-) diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index d5fe9bf73..b32ed5f2b 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: '', @@ -2311,6 +2312,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, @@ -2409,9 +2412,8 @@ export default { this.newForm.oldPeopleDto = this.form.oldPeopleDto } - if(this.newForm.specialDto) { this.newForm.specialDto = this.form.specialDto - } + this.newForm.specialDto.id = this.form.resiId } } } 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/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 @@