elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-work-pc into dev

feature
dai 3 years ago
parent
e411c08880 3661f4e384
commit
e34aa5df50
2 changed files with 94 additions and 64 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      src/views/components/resiForm.vue
  2. 114
      src/views/modules/base/resi.vue

44
src/views/components/resiForm.vue
View File

@ -233,8 +233,7 @@
<el-checkbox v-for="items in itemk.opction" <el-checkbox v-for="items in itemk.opction"
:label="items.label != itemk.label ? items.label :''" :label="items.label != itemk.label ? items.label :''"
:style="{'margin-right':items.label != itemk.label? '' :'19px'}" :style="{'margin-right':items.label != itemk.label? '' :'19px'}"
:key="items.label" :key="items.label"></el-checkbox>
@change="val => handleChangeCheckbox1(val,items)"></el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</template> </template>
<template v-else-if="itemk.itemType == 'datepicker1'"> <template v-else-if="itemk.itemType == 'datepicker1'">
@ -1205,7 +1204,7 @@ export default {
}) })
if(flag){ if(flag){
return this.newForm return JSON.stringify(this.newForm)
} }
return false return false
}, },
@ -1456,9 +1455,6 @@ export default {
handleChangeCheckbox(e,val){ handleChangeCheckbox(e,val){
this.handleTabShow(val,e) this.handleTabShow(val,e)
}, },
handleChangeCheckbox1(e,val){
console.log(this.form.hobbyInfoDto.hobbyCode)
},
handleTabShow(val,e){ handleTabShow(val,e){
if(e == 1){ if(e == 1){
if(val.formName == 'partyFlag'){ if(val.formName == 'partyFlag'){
@ -1821,7 +1817,7 @@ export default {
} }
}, },
getFormData(data) { getFormData(data) {
this.form.categoryId = '111222333',// 临时写死 this.form.categoryId = data.categoryInfo.id,// 临时写死
this.form.resiId = data.resiId this.form.resiId = data.resiId
this.form.buildId = data.houseInfo.buildId this.form.buildId = data.houseInfo.buildId
this.form.gridId = data.houseInfo.gridId this.form.gridId = data.houseInfo.gridId
@ -1834,8 +1830,8 @@ export default {
this.form.birthday = data.birthday this.form.birthday = data.birthday
this.form.gender = data.gender this.form.gender = data.gender
this.form.idNum = data.idNum this.form.idNum = data.idNum
this.form.localResidenceFlag = data.localResidenceFlag.toString() this.form.localResidenceFlag = data.localResidenceFlag ? data.localResidenceFlag.toString() : ''
this.form.mobile = data.mobile this.form.mobile = data.mobile ? data.mobile : ''
this.form.name = data.name this.form.name = data.name
this.form.nation = data.nation ? data.nation : '' this.form.nation = data.nation ? data.nation : ''
this.form.remark = data.remark ? data.remark : '' this.form.remark = data.remark ? data.remark : ''
@ -1919,6 +1915,7 @@ export default {
cultureLevel:'', cultureLevel:'',
eduRemark:'' eduRemark:''
} }
this.newForm.eduInfoDto = this.form.eduInfoDto
} }
}) })
}, },
@ -1928,11 +1925,15 @@ export default {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg); return this.$message.error(res.msg);
} else { } else {
if (res.data) {
res.data.hobbyCode = res.data.hobbyCode.split(',')
}
this.form.hobbyInfoDto = res.data ? res.data : { //兴趣爱好 this.form.hobbyInfoDto = res.data ? res.data : { //兴趣爱好
hobbyCode:[],//兴趣特长 hobbyCode:[],//兴趣特长
interestDesc:'',//兴趣 interestDesc:'',//兴趣
hobbyRemark:''//备注 hobbyRemark:''//备注
} }
this.newForm.hobbyInfoDto = this.form.hobbyInfoDto
} }
}) })
}, },
@ -1946,6 +1947,8 @@ export default {
religion:'', religion:'',
religionRemark:'' religionRemark:''
} }
this.newForm.religionDto = this.form.religionDto
} }
}) })
}, },
@ -1975,6 +1978,7 @@ export default {
deliveranceNum:'',//享受救助明细序号 deliveranceNum:'',//享受救助明细序号
healthRemark:''//备注 healthRemark:''//备注
} }
this.newForm.healthDto = this.form.healthDto
} }
}) })
}, },
@ -1990,6 +1994,8 @@ export default {
retireTime:'',//离退休时间 retireTime:'',//离退休时间
workRemark:'',//备注 workRemark:'',//备注
} }
this.newForm.workInfoDto = this.form.workInfoDto
} }
}) })
}, },
@ -2003,6 +2009,7 @@ export default {
retirementAmount:'',//退休金额 retirementAmount:'',//退休金额
monthIncome:'',//月收入 monthIncome:'',//月收入
} }
this.newForm.economyDto = this.form.economyDto
} }
}) })
}, },
@ -2019,6 +2026,7 @@ export default {
householdSituation:'',//人户情况，字典code householdSituation:'',//人户情况，字典code
resiRemark:'',//备注 resiRemark:'',//备注
} }
this.newForm.resideInfoDto = this.form.resideInfoDto
} }
}) })
}, },
@ -2038,6 +2046,7 @@ export default {
dependantMobile:'',//赡养人联系电话 dependantMobile:'',//赡养人联系电话
familyInfoRemark:'',//备注 familyInfoRemark:'',//备注
} }
this.newForm.familyInfoDto = this.form.familyInfoDto
} }
}) })
}, },
@ -2060,6 +2069,7 @@ export default {
joinCommunityTime:'',//组织关系转入社区时间yyyy-MM-dd joinCommunityTime:'',//组织关系转入社区时间yyyy-MM-dd
longHolidayFlag:null,//是否请长假：1是，0否 longHolidayFlag:null,//是否请长假：1是，0否
} }
this.newForm.parymemberInfoDto = this.form.parymemberInfoDto
} }
}) })
}, },
@ -2076,6 +2086,7 @@ export default {
subsidyNum:'',//补贴编号 subsidyNum:'',//补贴编号
subsidyAmount:'',//补贴金额 subsidyAmount:'',//补贴金额
} }
this.newForm.ensureHouseDto = this.form.ensureHouseDto
} }
}) })
}, },
@ -2095,6 +2106,7 @@ export default {
employmentHardFlag:null,//是否就业困难对象；1是0不是 employmentHardFlag:null,//是否就业困难对象；1是0不是
employmentWish:'',//劳动能力就业愿望 employmentWish:'',//劳动能力就业愿望
} }
this.newForm.unemployedDto = this.form.unemployedDto
} }
}) })
}, },
@ -2116,6 +2128,7 @@ export default {
joinWarEndTime:'',//参战时间截止日期yyyy-MM-dd joinWarEndTime:'',//参战时间截止日期yyyy-MM-dd
pubWelfareJobFlag:null,//是否办理公益性岗位;1是0否 pubWelfareJobFlag:null,//是否办理公益性岗位;1是0否
} }
this.newForm.veteranDto = this.form.veteranDto
} }
}) })
}, },
@ -2129,6 +2142,7 @@ export default {
duty:'',//职务 duty:'',//职务
visitation:'',//探亲情况 visitation:'',//探亲情况
} }
this.newForm.unitedFrontDto = this.form.unitedFrontDto
} }
}) })
}, },
@ -2138,10 +2152,15 @@ export default {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg); return this.$message.error(res.msg);
} else { } else {
if (res.data) {
res.data.volunteerCategory = res.data.volunteerCategory.split(',')
}
this.form.volunteerDto = res.data ? res.data : {//志愿者信息 this.form.volunteerDto = res.data ? res.data : {//志愿者信息
volunteerCategory:[],//志愿者类别 volunteerCategory:[],//志愿者类别
volunteerRemark:''//备注 volunteerRemark:''//备注
} }
this.newForm.volunteerDto = this.form.volunteerDto
} }
}) })
}, },
@ -2154,6 +2173,8 @@ export default {
this.form.oldPeopleDto = res.data ? res.data : { this.form.oldPeopleDto = res.data ? res.data : {
oldSubsidy:''//高龄补助 oldSubsidy:''//高龄补助
} }
this.newForm.oldPeopleDto = this.form.oldPeopleDto
} }
}) })
}, },
@ -2163,9 +2184,14 @@ export default {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg); return this.$message.error(res.msg);
} else { } else {
if (res.data) {
res.data.specialCategoryCode = res.data.specialCategoryCode.split(',')
}
this.form.specialDto = res.data ? res.data : {//特殊人群 this.form.specialDto = res.data ? res.data : {//特殊人群
specialCategoryCode:[]//人群类别【字典表】,可多选，以英文逗号隔开； specialCategoryCode:[]//人群类别【字典表】,可多选，以英文逗号隔开；
} }
this.newForm.specialDto = this.form.specialDto
} }
}) })
}, },

114
src/views/modules/base/resi.vue
View File

@ -1161,66 +1161,70 @@ export default {
}, },
async handleSUbmit() { async handleSUbmit() {
const _baseForm = this.$refs.baseForm.submit_from(); if (!this.$refs.baseForm.submit_from()) {
if (!_baseForm) {
return return
} }
(_baseForm.partyFlag = parseInt(_baseForm.partyFlag)), //党员 const _baseForm = JSON.parse(this.$refs.baseForm.submit_from())
(_baseForm.subsistenceAllowanceFlag = parseInt( _baseForm.partyFlag = parseInt(_baseForm.partyFlag) //党员
_baseForm.subsistenceAllowanceFlag _baseForm.subsistenceAllowanceFlag = parseInt(_baseForm.subsistenceAllowanceFlag) //低保
)), //低保 _baseForm.ensureHouseFlag = parseInt(_baseForm.ensureHouseFlag) //保障房
(_baseForm.ensureHouseFlag = parseInt(_baseForm.ensureHouseFlag)), //保障房 _baseForm.unemployedFlag = parseInt(_baseForm.unemployedFlag) //失业
(_baseForm.unemployedFlag = parseInt(_baseForm.unemployedFlag)), //失业 _baseForm.fertileWomanFlag = parseInt(_baseForm.fertileWomanFlag), //育龄妇女
(_baseForm.fertileWomanFlag = parseInt(_baseForm.fertileWomanFlag)), //育龄妇女 _baseForm.veteranFlag = parseInt(_baseForm.veteranFlag) //退役军人
(_baseForm.veteranFlag = parseInt(_baseForm.veteranFlag)), //退役军人 _baseForm.unitedFrontFlag = parseInt(_baseForm.unitedFrontFlag) //统战人员
(_baseForm.unitedFrontFlag = parseInt(_baseForm.unitedFrontFlag)), //统战人员 _baseForm.petitionOfficerFlag = parseInt(_baseForm.petitionOfficerFlag) //信访人员
(_baseForm.petitionOfficerFlag = parseInt( _baseForm.volunteerFlag = parseInt(_baseForm.volunteerFlag) //志愿者
_baseForm.petitionOfficerFlag _baseForm.bereavedPersonFlag = parseInt(_baseForm.bereavedPersonFlag) //失独
)), //信访人员 _baseForm.tenantFlag = parseInt(_baseForm.tenantFlag) //租户
(_baseForm.volunteerFlag = parseInt(_baseForm.volunteerFlag)), //志愿者 _baseForm.floatingFlag = parseInt(_baseForm.floatingFlag) //流动人口
(_baseForm.bereavedPersonFlag = parseInt(_baseForm.bereavedPersonFlag)), //失独 _baseForm.specialCrowdFlag = parseInt(_baseForm.specialCrowdFlag) //特殊人群
(_baseForm.tenantFlag = parseInt(_baseForm.tenantFlag)), //租户 _baseForm.oldPeopleFlag = parseInt(_baseForm.oldPeopleFlag) //老年人
(_baseForm.floatingFlag = parseInt(_baseForm.floatingFlag)), //流动人口 _baseForm.emptyNesterFlag = parseInt(_baseForm.emptyNesterFlag) //空巢
(_baseForm.specialCrowdFlag = parseInt(_baseForm.specialCrowdFlag)), //特殊人群 _baseForm.liveAloneFlag = parseInt(_baseForm.liveAloneFlag) //独居老人
(_baseForm.oldPeopleFlag = parseInt(_baseForm.oldPeopleFlag)), //老年人 _baseForm.disabledFlag = parseInt(_baseForm.disabledFlag) //失能老人
(_baseForm.emptyNesterFlag = parseInt(_baseForm.emptyNesterFlag)), //空巢 _baseForm.dementedFlag = parseInt(_baseForm.dementedFlag) //失智老人
(_baseForm.liveAloneFlag = parseInt(_baseForm.liveAloneFlag)), //独居老人 _baseForm.disabilityFlag = parseInt(_baseForm.disabilityFlag) //是否残疾
(_baseForm.disabledFlag = parseInt(_baseForm.disabledFlag)), //失能老人 _baseForm.seriousIllnessFlag = parseInt(_baseForm.seriousIllnessFlag) //大病
(_baseForm.dementedFlag = parseInt(_baseForm.dementedFlag)), //失智老人 _baseForm.chronicDiseaseFlag = parseInt(_baseForm.chronicDiseaseFlag) //慢病
(_baseForm.disabilityFlag = parseInt(_baseForm.disabilityFlag)), //是否残疾 var hobbyCode = ''
(_baseForm.seriousIllnessFlag = parseInt(_baseForm.seriousIllnessFlag)), //大病 if (_baseForm.hobbyInfoDto) {
(_baseForm.chronicDiseaseFlag = parseInt(_baseForm.chronicDiseaseFlag)); //慢病 if (_baseForm.hobbyInfoDto.hobbyCode.length === 0) {
if (_baseForm.hobbyInfoDto) { hobbyCode = "";
if ((_baseForm.hobbyInfoDto.hobbyCode = [])) { _baseForm.hobbyInfoDto.hobbyCode = hobbyCode
_baseForm.hobbyInfoDto.hobbyCode = ""; } else {
} else { _baseForm.hobbyInfoDto.hobbyCode.forEach((element,index) => {
_baseForm.hobbyInfoDto.hobbyCode.forEach((element) => { hobbyCode = index === 0 ? element : hobbyCode + "," + element
_baseForm.hobbyInfoDto.hobbyCode = });
_baseForm.hobbyInfoDto.hobbyCode ? _baseForm.hobbyInfoDto.hobbyCode + "," + element : _baseForm.hobbyInfoDto.hobbyCode; _baseForm.hobbyInfoDto.hobbyCode = hobbyCode
});
}
} }
if (_baseForm.volunteerDto) { }
if ((_baseForm.volunteerDto.volunteerCategory = [])) {
_baseForm.volunteerDto.volunteerCategory = ""; var volunteerCategory = ''
} else { if (_baseForm.volunteerDto) {
_baseForm.volunteerDto.volunteerCategory.forEach((element) => { if (_baseForm.volunteerDto.volunteerCategory.length === 0) {
_baseForm.volunteerDto.volunteerCategory = volunteerCategory = "";
_baseForm.volunteerDto.volunteerCategory ? _baseForm.volunteerDto.volunteerCategory + "," + element : _baseForm.volunteerDto.volunteerCategory; _baseForm.volunteerDto.volunteerCategory = volunteerCategory
}); } else {
} _baseForm.volunteerDto.volunteerCategory.forEach((element,index) => {
volunteerCategory = index === 0 ? element : volunteerCategory + "," + element
});
_baseForm.volunteerDto.volunteerCategory = volunteerCategory
} }
if (_baseForm.specialDto) { }
if ((_baseForm.specialDto.specialCategoryCode = [])) {
_baseForm.specialDto.specialCategoryCode = ""; var specialCategoryCode = ''
} else { if (_baseForm.specialDto) {
_baseForm.specialDto.specialCategoryCode.forEach((element) => { if (_baseForm.specialDto.specialCategoryCode.length === 0) {
_baseForm.specialDto.specialCategoryCode = specialCategoryCode = "";
_baseForm.specialDto.specialCategoryCode ? _baseForm.specialDto.specialCategoryCode + "," + element : _baseForm.specialDto.specialCategoryCode; _baseForm.specialDto.specialCategoryCode = specialCategoryCode
}); } else {
} _baseForm.specialDto.specialCategoryCode.forEach((element,index) => {
specialCategoryCode = index === 0 ? element : specialCategoryCode + "," + element
});
_baseForm.specialDto.specialCategoryCode = specialCategoryCode
} }
this.submitAdd(_baseForm); }
this.submitAdd(_baseForm);
}, },
handleDel(row) { handleDel(row) {
let params = { let params = {

Write Preview
Loading…
Cancel
Save