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() {