zhaoyongnian 3 years ago
parent
commit
a5560d03b2
  1. 12
      src/views/components/resiForm.vue
  2. 111
      src/views/modules/base/resi.vue

12
src/views/components/resiForm.vue

@ -233,8 +233,7 @@
<el-checkbox v-for="items in itemk.opction"
:label="items.label != itemk.label ? items.label :''"
:style="{'margin-right':items.label != itemk.label? '' :'19px'}"
:key="items.label"
@change="val => handleChangeCheckbox1(val,items)"></el-checkbox>
:key="items.label"></el-checkbox>
</el-checkbox-group>
</template>
<template v-else-if="itemk.itemType == 'datepicker1'">
@ -1205,7 +1204,7 @@ export default {
})
if(flag){
return this.newForm
return JSON.stringify(this.newForm)
}
return false
},
@ -1456,9 +1455,6 @@ export default {
handleChangeCheckbox(e,val){
this.handleTabShow(val,e)
},
handleChangeCheckbox1(e,val){
console.log(this.form.hobbyInfoDto.hobbyCode)
},
handleTabShow(val,e){
if(e == 1){
if(val.formName == 'partyFlag'){
@ -1834,8 +1830,8 @@ export default {
this.form.birthday = data.birthday
this.form.gender = data.gender
this.form.idNum = data.idNum
this.form.localResidenceFlag = data.localResidenceFlag.toString()
this.form.mobile = data.mobile
this.form.localResidenceFlag = data.localResidenceFlag ? data.localResidenceFlag.toString() : ''
this.form.mobile = data.mobile ? data.mobile : ''
this.form.name = data.name
this.form.nation = data.nation ? data.nation : ''
this.form.remark = data.remark ? data.remark : ''

111
src/views/modules/base/resi.vue

@ -1161,66 +1161,67 @@ export default {
},
async handleSUbmit() {
const _baseForm = this.$refs.baseForm.submit_from();
if (!_baseForm) {
if (!this.$refs.baseForm.submit_from()) {
return
}
(_baseForm.partyFlag = parseInt(_baseForm.partyFlag)), //
(_baseForm.subsistenceAllowanceFlag = parseInt(
_baseForm.subsistenceAllowanceFlag
)), //
(_baseForm.ensureHouseFlag = parseInt(_baseForm.ensureHouseFlag)), //
(_baseForm.unemployedFlag = parseInt(_baseForm.unemployedFlag)), //
(_baseForm.fertileWomanFlag = parseInt(_baseForm.fertileWomanFlag)), //
(_baseForm.veteranFlag = parseInt(_baseForm.veteranFlag)), //退
(_baseForm.unitedFrontFlag = parseInt(_baseForm.unitedFrontFlag)), //
(_baseForm.petitionOfficerFlag = parseInt(
_baseForm.petitionOfficerFlag
)), //访
(_baseForm.volunteerFlag = parseInt(_baseForm.volunteerFlag)), //
(_baseForm.bereavedPersonFlag = parseInt(_baseForm.bereavedPersonFlag)), //
(_baseForm.tenantFlag = parseInt(_baseForm.tenantFlag)), //
(_baseForm.floatingFlag = parseInt(_baseForm.floatingFlag)), //
(_baseForm.specialCrowdFlag = parseInt(_baseForm.specialCrowdFlag)), //
(_baseForm.oldPeopleFlag = parseInt(_baseForm.oldPeopleFlag)), //
(_baseForm.emptyNesterFlag = parseInt(_baseForm.emptyNesterFlag)), //
(_baseForm.liveAloneFlag = parseInt(_baseForm.liveAloneFlag)), //
(_baseForm.disabledFlag = parseInt(_baseForm.disabledFlag)), //
(_baseForm.dementedFlag = parseInt(_baseForm.dementedFlag)), //
(_baseForm.disabilityFlag = parseInt(_baseForm.disabilityFlag)), //
(_baseForm.seriousIllnessFlag = parseInt(_baseForm.seriousIllnessFlag)), //
(_baseForm.chronicDiseaseFlag = parseInt(_baseForm.chronicDiseaseFlag)); //
if (_baseForm.hobbyInfoDto) {
if ((_baseForm.hobbyInfoDto.hobbyCode = [])) {
_baseForm.hobbyInfoDto.hobbyCode = "";
} else {
_baseForm.hobbyInfoDto.hobbyCode.forEach((element) => {
_baseForm.hobbyInfoDto.hobbyCode =
_baseForm.hobbyInfoDto.hobbyCode ? _baseForm.hobbyInfoDto.hobbyCode + "," + element : _baseForm.hobbyInfoDto.hobbyCode;
});
}
const _baseForm = JSON.parse(this.$refs.baseForm.submit_from())
_baseForm.partyFlag = parseInt(_baseForm.partyFlag) //
_baseForm.subsistenceAllowanceFlag = parseInt(_baseForm.subsistenceAllowanceFlag) //
_baseForm.ensureHouseFlag = parseInt(_baseForm.ensureHouseFlag) //
_baseForm.unemployedFlag = parseInt(_baseForm.unemployedFlag) //
_baseForm.fertileWomanFlag = parseInt(_baseForm.fertileWomanFlag), //
_baseForm.veteranFlag = parseInt(_baseForm.veteranFlag) //退
_baseForm.unitedFrontFlag = parseInt(_baseForm.unitedFrontFlag) //
_baseForm.petitionOfficerFlag = parseInt(_baseForm.petitionOfficerFlag) //访
_baseForm.volunteerFlag = parseInt(_baseForm.volunteerFlag) //
_baseForm.bereavedPersonFlag = parseInt(_baseForm.bereavedPersonFlag) //
_baseForm.tenantFlag = parseInt(_baseForm.tenantFlag) //
_baseForm.floatingFlag = parseInt(_baseForm.floatingFlag) //
_baseForm.specialCrowdFlag = parseInt(_baseForm.specialCrowdFlag) //
_baseForm.oldPeopleFlag = parseInt(_baseForm.oldPeopleFlag) //
_baseForm.emptyNesterFlag = parseInt(_baseForm.emptyNesterFlag) //
_baseForm.liveAloneFlag = parseInt(_baseForm.liveAloneFlag) //
_baseForm.disabledFlag = parseInt(_baseForm.disabledFlag) //
_baseForm.dementedFlag = parseInt(_baseForm.dementedFlag) //
_baseForm.disabilityFlag = parseInt(_baseForm.disabilityFlag) //
_baseForm.seriousIllnessFlag = parseInt(_baseForm.seriousIllnessFlag) //
_baseForm.chronicDiseaseFlag = parseInt(_baseForm.chronicDiseaseFlag) //
var hobbyCode = ''
if (_baseForm.hobbyInfoDto) {
if (_baseForm.hobbyInfoDto.hobbyCode.length === 0) {
hobbyCode = "";
} else {
_baseForm.hobbyInfoDto.hobbyCode.forEach((element,index) => {
hobbyCode = index === 0 ? element : hobbyCode + "," + element
});
_baseForm.hobbyInfoDto.hobbyCode = hobbyCode
}
if (_baseForm.volunteerDto) {
if ((_baseForm.volunteerDto.volunteerCategory = [])) {
_baseForm.volunteerDto.volunteerCategory = "";
} else {
_baseForm.volunteerDto.volunteerCategory.forEach((element) => {
_baseForm.volunteerDto.volunteerCategory =
_baseForm.volunteerDto.volunteerCategory ? _baseForm.volunteerDto.volunteerCategory + "," + element : _baseForm.volunteerDto.volunteerCategory;
});
}
}
var volunteerCategory = ''
if (_baseForm.volunteerDto) {
if (_baseForm.volunteerDto.volunteerCategory.length === 0) {
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 = "";
} else {
_baseForm.specialDto.specialCategoryCode.forEach((element) => {
_baseForm.specialDto.specialCategoryCode =
_baseForm.specialDto.specialCategoryCode ? _baseForm.specialDto.specialCategoryCode + "," + element : _baseForm.specialDto.specialCategoryCode;
});
}
}
var specialCategoryCode = ''
if (_baseForm.specialDto) {
if (_baseForm.specialDto.specialCategoryCode.length === 0) {
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) {
let params = {

Loading…
Cancel
Save