From b5d7ee5c5876c930f66b357d54c92b112311581c Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 28 Apr 2022 11:21:28 +0800 Subject: [PATCH] bug --- packages/jianping/AppHelpedResident/hrAdd.vue | 61 +++++++++++++------ .../jianping/AppHelpedResident/hrDetail.vue | 50 +++++++++------ 2 files changed, 73 insertions(+), 38 deletions(-) diff --git a/packages/jianping/AppHelpedResident/hrAdd.vue b/packages/jianping/AppHelpedResident/hrAdd.vue index c755b866..7a7bd583 100644 --- a/packages/jianping/AppHelpedResident/hrAdd.vue +++ b/packages/jianping/AppHelpedResident/hrAdd.vue @@ -322,22 +322,22 @@ export default { }, guaranteeCheckList() { return [ - {label: '享受农村最低生活保障', value: 0}, - {label: '是否特困供养人员', value: 1}, - {label: '分散供养五保户转集中供养（减少）', value: 2}, - {label: '是否接受医疗救助', value: 3}, - {label: '是否接受其它健康扶贫', value: 4}, + {label: '享受农村最低生活保障', value: '0'}, + {label: '是否特困供养人员', value: '1'}, + {label: '分散供养五保户转集中供养（减少）', value: '2'}, + {label: '是否接受医疗救助', value: '3'}, + {label: '是否接受其它健康扶贫', value: '4'}, ] }, basicsCheckList() { return [ - {label: '城乡居民基本医疗保险', value: 0}, - {label: '城镇职工基本医疗保险', value: 1}, - {label: '大病保险', value: 2}, - {label: '商业补充医疗保险', value: 3}, - {label: '城乡居民基本养老保险', value: 4}, - {label: '城镇职工基本养老保险', value: 5}, - {label: '享受人身意外保险补贴', value: 6}, + {label: '城乡居民基本医疗保险', value: '0'}, + {label: '城镇职工基本医疗保险', value: '1'}, + {label: '大病保险', value: '2'}, + {label: '商业补充医疗保险', value: '3'}, + {label: '城乡居民基本养老保险', value: '4'}, + {label: '城镇职工基本养老保险', value: '5'}, + {label: '享受人身意外保险补贴', value: '6'}, ] }, }, @@ -366,9 +366,6 @@ export default { this.form.birthDate = '' this.form.sex = '' this.form.age = '' - this.form.nation = '' - this.form.education = '' - this.form.politicsStatus = '' return } this.form.name = e.name @@ -376,9 +373,6 @@ export default { this.form.phone = e.phone this.form.currentAreaId = e.currentAreaId this.form.currentAddress = e.currentAddress - this.form.nation = e.nation - this.form.education = e.education - this.form.politicsStatus = e.politicsStatus this.handleIdNumberAutocomplete(e.idNumber) this.isSelectUser = true }, @@ -398,11 +392,12 @@ export default { res.data.healthyStatusList = res.data.healthyStatus.split(',') } if(res.data.basicsCheck) { - res.data.basicsList = res.data.basicsCheck.split(',') + res.data.basicsList = res.data.basicsCheck.split(',') } if(res.data.guaranteeCheck) { - res.data.guaranteeList = res.data.guaranteeCheck.split(',') + res.data.guaranteeList = res.data.guaranteeCheck.split(',') } + console.log(res.data) this.form = {...res.data} } }) @@ -428,6 +423,25 @@ export default { if(this.form.guaranteeList.length) { this.form.guaranteeCheck = this.form.basicsList.join(',') } + if([1, 2, 3].includes(2)) { + this.form.jcbxCxyiliao = '01' + }else { + this.form.jcbxCxyiliao = '02' + } + this.checkInit('jcbxCxyiliao',this.form.basicsList, '0') + this.checkInit('jcbxCzyiliao',this.form.basicsList, '1') + this.checkInit('jcbxDabing',this.form.basicsList, '2') + this.checkInit('jcbxShangye',this.form.basicsList, '3') + this.checkInit('jcbxCxyanglao',this.form.basicsList, '4') + this.checkInit('jcbxCzyanglao',this.form.basicsList, '5') + this.checkInit('jcbxRenshenyiwai',this.form.basicsList, '6') + + this.checkInit('bzcsNongcundibao',this.form.guaranteeList, '0') + this.checkInit('bzcsTekungongyang',this.form.guaranteeList, '1') + this.checkInit('bzcsWubaohu',this.form.guaranteeList, '2') + this.checkInit('bzcsYiliaojiuzhu',this.form.guaranteeList, '3') + this.checkInit('bzcsQita',this.form.guaranteeList, '4') + this.instance.post(`/app/apppreventionreturntopoverty/addOrUpdate`, this.form).then(res => { if (res.code == 0) { this.$message.success('提交成功!'); @@ -436,6 +450,13 @@ export default { }) } }) + }, + checkInit(formName, list, value) { + if(list.includes(value)) { + this.form[formName] = '01' + }else { + this.form[formName] = '02' + } } }, created() { diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue index 617129ed..9bc6f95e 100644 --- a/packages/jianping/AppHelpedResident/hrDetail.vue +++ b/packages/jianping/AppHelpedResident/hrDetail.vue @@ -482,22 +482,22 @@ export default { }, guaranteeCheckList() { return [ - { label: '享受农村最低生活保障', value: 0 }, - { label: '是否特困供养人员', value: 1 }, - { label: '分散供养五保户转集中供养（减少）', value: 2 }, - { label: '是否接受医疗救助', value: 3 }, - { label: '是否接受其它健康扶贫', value: 4 }, + {label: '享受农村最低生活保障', value: '0'}, + {label: '是否特困供养人员', value: '1'}, + {label: '分散供养五保户转集中供养（减少）', value: '2'}, + {label: '是否接受医疗救助', value: '3'}, + {label: '是否接受其它健康扶贫', value: '4'}, ] }, basicsCheckList() { return [ - { label: '城乡居民基本医疗保险', value: 0 }, - { label: '城镇职工基本医疗保险', value: 1 }, - { label: '大病保险', value: 2 }, - { label: '商业补充医疗保险', value: 3 }, - { label: '城乡居民基本养老保险', value: 4 }, - { label: '城镇职工基本养老保险', value: 5 }, - { label: '享受人身意外保险补贴', value: 6 }, + {label: '城乡居民基本医疗保险', value: '0'}, + {label: '城镇职工基本医疗保险', value: '1'}, + {label: '大病保险', value: '2'}, + {label: '商业补充医疗保险', value: '3'}, + {label: '城乡居民基本养老保险', value: '4'}, + {label: '城镇职工基本养老保险', value: '5'}, + {label: '享受人身意外保险补贴', value: '6'}, ] }, }, @@ -537,9 +537,6 @@ export default { this.form.age = '' this.form.currentAreaId = '' this.form.currentAddress = '' - this.form.nation = '' - this.form.education = '' - this.form.politicsStatus = '' return } this.form.name = e.name @@ -547,9 +544,6 @@ export default { this.form.phone = e.phone this.form.currentAreaId = e.currentAreaId this.form.currentAddress = e.currentAddress - this.form.nation = e.nation - this.form.education = e.education - this.form.politicsStatus = e.politicsStatus this.handleIdNumberAutocomplete(e.idNumber) this.isSelectUser = true }, @@ -619,6 +613,19 @@ export default { if (this.form.guaranteeList.length) { this.form.guaranteeCheck = this.form.basicsList.join(',') } + this.checkInit('jcbxCxyiliao',this.form.basicsList, '0') + this.checkInit('jcbxCzyiliao',this.form.basicsList, '1') + this.checkInit('jcbxDabing',this.form.basicsList, '2') + this.checkInit('jcbxShangye',this.form.basicsList, '3') + this.checkInit('jcbxCxyanglao',this.form.basicsList, '4') + this.checkInit('jcbxCzyanglao',this.form.basicsList, '5') + this.checkInit('jcbxRenshenyiwai',this.form.basicsList, '6') + + this.checkInit('bzcsNongcundibao',this.form.guaranteeList, '0') + this.checkInit('bzcsTekungongyang',this.form.guaranteeList, '1') + this.checkInit('bzcsWubaohu',this.form.guaranteeList, '2') + this.checkInit('bzcsYiliaojiuzhu',this.form.guaranteeList, '3') + this.checkInit('bzcsQita',this.form.guaranteeList, '4') this.instance.post(`/app/apppreventionreturntopoverty/addOrUpdate`, this.form).then(res => { if (res.code == 0) { this.getDetail() @@ -629,6 +636,13 @@ export default { } }); }, + checkInit(formName, list, value) { + if(list.includes(value)) { + this.form[formName] = '01' + }else { + this.form[formName] = '02' + } + }, onClose() { this.isShowAdd = false; },