From b5d7ee5c5876c930f66b357d54c92b112311581c Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 28 Apr 2022 11:21:28 +0800 Subject: [PATCH 1/4] 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; }, From 74b98805a556490df0057f88688840cd4b4cc32f Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 28 Apr 2022 11:35:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=84=B1=E8=B4=AB=E5=B9=B4=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/jianping/AppHelpedResident/hrAdd.vue | 2 +- packages/jianping/AppHelpedResident/hrDetail.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/jianping/AppHelpedResident/hrAdd.vue b/packages/jianping/AppHelpedResident/hrAdd.vue index 7a7bd583..d08e8ecd 100644 --- a/packages/jianping/AppHelpedResident/hrAdd.vue +++ b/packages/jianping/AppHelpedResident/hrAdd.vue @@ -192,7 +192,7 @@ - + diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue index 9bc6f95e..ad823eb5 100644 --- a/packages/jianping/AppHelpedResident/hrDetail.vue +++ b/packages/jianping/AppHelpedResident/hrDetail.vue @@ -110,7 +110,7 @@ {{ dict.getLabel("fpType", detail.objectType)}} {{ dict.getLabel("fpYesOrNo", detail.militaryMartyrs)}} {{ dict.getLabel("fpRiskType", detail.riskType)}} - {{detail.povertyYear}} + {{ dict.getLabel("fpYear", detail.povertyYear)}} {{ dict.getLabel("fpNaturalDisaster", detail.naturalDisasterType)}} {{ dict.getLabel("fpYesOrNo", detail.dropOutOfSchool)}} {{ detail.createTime}} From 0a815cbb3589c34ef36f98bf9f78a0ecb9743ed0 Mon Sep 17 00:00:00 2001 From: aixianling Date: Thu, 28 Apr 2022 11:49:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=80=E4=B8=8B?= =?UTF-8?q?=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sass/apps/AppGridBlock/AppGridBlock.vue | 2 +- project/sass/apps/AppGridMap/AppGridMap.vue | 2 +- .../sass/apps/AppGridMember/AppGridMember.vue | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/project/sass/apps/AppGridBlock/AppGridBlock.vue b/project/sass/apps/AppGridBlock/AppGridBlock.vue index 3e0872f4..bbca78be 100644 --- a/project/sass/apps/AppGridBlock/AppGridBlock.vue +++ b/project/sass/apps/AppGridBlock/AppGridBlock.vue @@ -20,7 +20,7 @@ import Add from "./components/add"; export default { name: "AppGridBlock", - label: "网格区块", + label: "网格区块(saas)", props: { instance: Function, diff --git a/project/sass/apps/AppGridMap/AppGridMap.vue b/project/sass/apps/AppGridMap/AppGridMap.vue index c6918b54..5437a42f 100644 --- a/project/sass/apps/AppGridMap/AppGridMap.vue +++ b/project/sass/apps/AppGridMap/AppGridMap.vue @@ -18,7 +18,7 @@ import List from "./components/list"; export default { name: "AppGridMap", - label: "网格地图", + label: "网格地图(saas)", props: { instance: Function, diff --git a/project/sass/apps/AppGridMember/AppGridMember.vue b/project/sass/apps/AppGridMember/AppGridMember.vue index fa9f5d03..2d1a53f7 100644 --- a/project/sass/apps/AppGridMember/AppGridMember.vue +++ b/project/sass/apps/AppGridMember/AppGridMember.vue @@ -2,12 +2,12 @@
@@ -20,8 +20,7 @@ import Family from "./components/Family"; export default { name: "AppGridMember", - label: "网格管理员", - + label: "网格管理员(saas)", props: { instance: Function, dict: Object, @@ -41,7 +40,8 @@ export default { Family }, - mounted() {}, + mounted() { + }, methods: { onChange(data) { From 476dec8d17f6fa07bb1d181dce297df5aa843d83 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 28 Apr 2022 11:50:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/jianping/AppHelpedResident/hrDetail.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue index ad823eb5..83eb6e6e 100644 --- a/packages/jianping/AppHelpedResident/hrDetail.vue +++ b/packages/jianping/AppHelpedResident/hrDetail.vue @@ -120,10 +120,10 @@ {{ detail.updateUserPhone}} {{detail.dropOutOfSchoolReason}} - {{detail.detail}} +