From a5560d03b28333a03ec31453093f3fc179ff2263 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Tue, 10 Jan 2023 17:11:29 +0800
Subject: [PATCH] bug
---
src/views/components/resiForm.vue | 12 ++--
src/views/modules/base/resi.vue | 111 +++++++++++++++---------------
2 files changed, 60 insertions(+), 63 deletions(-)
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 0e22bf00c..50a88a3de 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -233,8 +233,7 @@
+ :key="items.label">
@@ -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 : ''
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 82f0c4ddd..b6215dbcc 100644
--- a/src/views/modules/base/resi.vue
+++ b/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 = {