diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index 59d554eb2..7b6431bf8 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -552,8 +552,9 @@ export default { { label: '残疾', value: '0', formName: "disabilityFlag" }, { label: '大病', value: '0', formName: "seriousIllnessFlag" }, { label: '慢病', value: '0', formName: "chronicDiseaseFlag" }, - { label: '公益岗人员', value: '0', formName: "publicWelfareFlag" } - + { label: '公益岗人员', value: '0', formName: "publicWelfareFlag" }, + { label: '楼长', value: '0', formName: "buildingChiefFlag" }, + { label: '单元长', value: '0', formName: "unitChiefFlag" } ] } ], @@ -1398,6 +1399,8 @@ export default { disabilityFlag: '0',//是否残疾 seriousIllnessFlag: '0', //大病 chronicDiseaseFlag: '0', //慢病 + buildingChiefFlag: '0', //楼长 + unitChiefFlag: '0', //单元长 eduInfoDto: { // 教育信息 cultureLevel: '', @@ -2312,7 +2315,8 @@ export default { this.form.floatingFlag = data.categoryInfo.floatingFlag.toString() this.form.liveAloneFlag = data.categoryInfo.liveAloneFlag.toString() this.form.publicWelfareFlag = data.categoryInfo.publicWelfareFlag.toString() - this.form.publicWelfareFlag = data.categoryInfo.publicWelfareFlag.toString() + this.form.buildingChiefFlag = data.categoryInfo.buildingChiefFlag.toString() + this.form.unitChiefFlag = data.categoryInfo.unitChiefFlag.toString() if (this.form.partyFlag == '1') this.tabsList.push({ label: '党员', id: '0', groupId: 'parymemberInfoDto' }) if (this.form.ensureHouseFlag == '1') this.tabsList.push({ label: '保障房信息', id: '1', groupId: 'ensureHouseDto' }) @@ -2331,7 +2335,7 @@ export default { villageId, birthday, gender, idType, idNum, localResidenceFlag, mobile, name, nation, nationality, remark, partyFlag, subsistenceAllowanceFlag, ensureHouseFlag, unemployedFlag, fertileWomanFlag, veteranFlag, unitedFrontFlag, petitionOfficerFlag, volunteerFlag, oldPeopleFlag, emptyNesterFlag, specialSupportFlag, disabledFlag, - dementedFlag, disabilityFlag, seriousIllnessFlag, chronicDiseaseFlag, specialCrowdFlag, tenantFlag, floatingFlag, liveAloneFlag, publicWelfareFlag } = this.form + dementedFlag, disabilityFlag, seriousIllnessFlag, chronicDiseaseFlag, specialCrowdFlag, tenantFlag, floatingFlag, liveAloneFlag, publicWelfareFlag,buildingChiefFlag, unitChiefFlag} = this.form this.newForm = { categoryId, resiId, @@ -2375,7 +2379,8 @@ export default { floatingFlag, liveAloneFlag, publicWelfareFlag, - + buildingChiefFlag, + unitChiefFlag, } }, // 教育信息详情 @@ -2863,7 +2868,9 @@ export default { this.newForm.disabilityFlag = this.form.disabilityFlag, this.newForm.seriousIllnessFlag = this.form.seriousIllnessFlag, this.newForm.chronicDiseaseFlag = this.form.chronicDiseaseFlag, - this.newForm.publicWelfareFlag = this.form.publicWelfareFlag + this.newForm.publicWelfareFlag = this.form.publicWelfareFlag, + this.newForm.buildingChiefFlag = this.form.buildingChiefFlag, + this.newForm.unitChiefFlag = this.form.unitChiefFlag if (this.newForm.eduInfoDto) { this.newForm.eduInfoDto = this.form.eduInfoDto diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 7d2b4a14c..c8ce8c334 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -210,6 +210,16 @@ ? "志愿者 " : "" }} + {{ + scope.row.categoryInfo.buildingChiefFlag == 1 + ? "楼长 " + : "" + }} + {{ + scope.row.categoryInfo.unitChiefFlag == 1 + ? "单元长 " + : "" + }} @@ -975,6 +985,11 @@ export default { _baseForm.disabledFlag = parseInt(_baseForm.disabledFlag); //失能老人 _baseForm.dementedFlag = parseInt(_baseForm.dementedFlag); //失智老人 _baseForm.disabilityFlag = parseInt(_baseForm.disabilityFlag); //是否残疾 + + _baseForm.buildingChiefFlag = parseInt(_baseForm.buildingChiefFlag); //是否楼长 + _baseForm.unitChiefFlag = parseInt(_baseForm.unitChiefFlag); //是否单元长 + + _baseForm.seriousIllnessFlag = parseInt( _baseForm.seriousIllnessFlag ); //大病