From 46040a3ef9de2a5f583a5e1dbed03a3f4e5c7f64 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 17 Feb 2023 17:37:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=8F=9C=E5=8D=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/community/community.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index f4c1f3b44..c6428be60 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -664,6 +664,7 @@ export default { async loadTree (isRefresh) { const url = "/actual/base/communityBuilding/tree/initTree" const { data, code, msg } = await requestGet(url) + this.handleNodeClick(data) if (code === 0) { this.treeData = [] this.treeData.push(data) @@ -739,7 +740,9 @@ export default { this.vDisabled = false this.bDisabled = false if (obj.level === 'building') {//点击楼栋 - this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj) + setTimeout(()=>{ + this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj) + },100) this.selAgencyId = '' this.selGridId = '' await this.getValiheList() From a317001b787dd1895f8e52a39aacda724392ce3a Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Sun, 19 Feb 2023 19:38:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98,=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8F=B3=E4=BE=A7=E5=88=97=E8=A1=A8=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E8=BF=9B=E5=85=A5=E4=B8=8B=E4=B8=80=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiForm.vue | 20 +++++++++++++ .../modules/base/community/community.vue | 30 +++++++++++++------ 2 files changed, 41 insertions(+), 9 deletions(-) diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index 2a2cb1eee..94899b10b 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -1627,6 +1627,9 @@ export default { // 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 @@ -1971,6 +1974,7 @@ export default { }, // 教育信息详情 residentEduInfo(id) { + if(this.newForm.eduInfoDto) return this.$http.get(`/actual/base/residentEduInfo/detail/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -1985,6 +1989,7 @@ export default { }, // 兴趣爱好详情 residentHobbyInfo(id) { + if(this.newForm.hobbyInfoDto) return this.$http.get(`/actual/base/residentHobbyInfo/detail/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2003,6 +2008,7 @@ export default { }, // 宗教信仰详情 residentReligion(id) { + if(this.newForm.religionDto) return this.$http.get(`/actual/base/residentReligion/detail/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2018,6 +2024,7 @@ export default { }, // 健康信息详情 getHealthInfoDetailById(id) { + if(this.newForm.healthDto) return this.$http.post(`/actual/base/residentHealthInfo/getHealthInfoDetailById/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2049,6 +2056,7 @@ export default { }, // 工作信息详情 residentWorkInfo(id) { + if(this.newForm.healthDto) return this.$http.get(`/actual/base/residentWorkInfo/detail/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2066,6 +2074,7 @@ export default { }, // 经济状况详情 getEconomyDetailById(id) { + if(this.newForm.economyDto) return this.$http.post(`/actual/base/residentEconomy/getEconomyDetailById/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2080,6 +2089,7 @@ export default { }, // 居住信息详情 getResideInfoDetailById(id) { + if(this.newForm.resideInfoDto) return this.$http.post(`/actual/base/residentResideInfo/getResideInfoDetailById/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2097,6 +2107,7 @@ export default { }, // 家庭信息详情 getFamilyInfoDetailById(id) { + if(this.newForm.familyInfoDto) return this.$http.post(`/actual/base/residentFamilyInfo/getFamilyInfoDetailById/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2117,6 +2128,7 @@ export default { }, // 出生人员 residentBirthRecord(id) { + if(this.newForm.birthRecordDTO) return this.$http.post(`/actual/base/residentBirthRecord/detail/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2134,6 +2146,7 @@ export default { }, // 党员信息详情 residentPartyMemberInfo(id) { + if(this.newForm.parymemberInfoDto) return this.$http.get(`/actual/base/residentPartyMemberInfo/detail/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2157,6 +2170,7 @@ export default { }, // 保障房信息详情 residentEnsureHouse(id) { + if(this.newForm.ensureHouseDto) return this.$http.get(`/actual/base/residentEnsureHouse/detail/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2174,6 +2188,7 @@ export default { }, // 失业信息详情 residentUnemployed(id) { + if(this.newForm.unemployedDto) return this.$http.get(`/actual/base/residentUnemployed/detail/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2194,6 +2209,7 @@ export default { }, // 退役军人信息详情 getVeteranDetailById(id) { + if(this.newForm.veteranDto) return this.$http.post(`/actual/base/residentVeteran/getVeteranDetailById/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2216,6 +2232,7 @@ export default { }, // 统战人员详情 residentUnitedFront(id) { + if(this.newForm.unitedFrontDto) return this.$http.get(`/actual/base/residentUnitedFront/detail/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2230,6 +2247,7 @@ export default { }, // 志愿者信息详情 getVolunteerDetailById(id) { + if(this.newForm.volunteerDto) return this.$http.post(`/actual/base/residentVolunteer/getVolunteerDetailById/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2248,6 +2266,7 @@ export default { }, // 老年人信息详情 getOldPeopleDetailById(id) { + if(this.newForm.oldPeopleDto) return this.$http.post(`/actual/base/residentOldPeople/getOldPeopleDetailById/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -2262,6 +2281,7 @@ export default { }, // 特殊人群信息 residentSpecial(id) { + if(this.newForm.specialDto) return this.$http.get(`/actual/base/residentSpecial/detail/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index c6428be60..adba323f9 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -19,7 +19,9 @@ :filter-node-method="filterNode" @node-click="handleNodeClick" lazy + auto-expand-parent :default-expanded-keys="autoOpenArr" + :load="lazyLoadTree"> { + // nextTick(1000) + // this.selTreeObj = this.$refs.ref_tree.getNode(row.neighborHoodId).data || {} + // },50) + // this.autoOpenArr.push(this.selTreeObj.id) + // } else { + // this.selTreeObj = this.$refs.ref_tree.getNode(row.buildingId).data + // } + console.log(this.selTreeObj,'123123123'); this.handleNodeClick(this.selTreeObj) this.$nextTick(() => { // ref_tree 元素的ref value 绑定的node-key From dba82baaa5dd21d0497d7e773de2bf584218f16e Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 20 Feb 2023 09:27:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=85=B4=E8=B6=A3=E7=88=B1=E5=A5=BD?= =?UTF-8?q?=E5=AD=97=E5=85=B8,=E5=BF=97=E6=84=BF=E8=80=85=E7=B1=BB?= =?UTF-8?q?=E5=88=AB=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 | 54 ++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index 94899b10b..2015ecae9 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -415,15 +415,7 @@ export default { itemType:"checkbox", formName:"hobbyCode", opction:[ - {label:'治安巡逻',formName:'hobbyCode1'}, - {label:'人民调解',formName:'hobbyCode2'}, - {label:'民情采集',formName:'hobbyCode3'}, - {label:'问题辅导',formName:'hobbyCode4'}, - {label:'结对帮扶',formName:'hobbyCode5'}, - {label:'应急处理',formName:'hobbyCode6'}, - {label:'义务理发',formName:'hobbyCode7'}, - {label:'家电维修',formName:'hobbyCode8'}, - {label:'其他',formName:'9'}, + ]}, { label:'兴趣', @@ -968,14 +960,6 @@ export default { itemType:"checkbox", formName:"volunteerCategory", opction:[ - {label:'文化队伍',formName:'hobbyCode1'}, - {label:'楼委会',formName:'hobbyCode2'}, - {label:'能人达人',formName:'hobbyCode3'}, - {label:'老友俱乐部',formName:'hobbyCode4'}, - {label:'代办员',formName:'hobbyCode5'}, - {label:'调解员',formName:'hobbyCode6'}, - {label:'采集员',formName:'hobbyCode7'}, - {label:'治安巡逻员',formName:'9'}, ]}, { label:'备注', @@ -1282,6 +1266,8 @@ export default { this.getPartyNation() this.getResidentNation() this.getHousing() + this.getVolunteerNation() + this.gethobbyNation() }, getGridList () { const { user } = this.$store.state @@ -1325,6 +1311,38 @@ export default { console.log(error,'获取残疾字典'); } + }, + async getVolunteerNation(){ + try { + const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'VOLUNTEER_CATEGORY'}) + this.footerInputList.forEach(c => { + for(let i of c.children){ + if(i.formName == 'volunteerCategory'){ + i.opction = data.data + } + } + }) + + } catch (error) { + console.log(error,'获取志愿者字典'); + } + + }, + async gethobbyNation(){ + try { + const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'SPECIAL_SKILL'}) + this.footerInputList.forEach(c => { + for(let i of c.children){ + if(i.formName == 'hobbyCode'){ + i.opction = data.data + } + } + }) + + } catch (error) { + console.log(error,'获取兴趣爱好字典'); + } + }, async getdisabilityNationClass(){ try { @@ -1436,6 +1454,7 @@ export default { async getResidentNation(){ try { const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'special_resident_category'}) + console.log(data.data,'see'); this.footerInputList.forEach(c => { for(let i of c.children){ if(i.formName == 'specialCategoryCode'){ @@ -2342,7 +2361,6 @@ export default { } this.newForm.eduInfoDto = this.form.eduInfoDto - this.newForm.specialDto = this.form.specialDto console.log(this.newForm.specialDto); }, setJSON() {