diff --git a/src/views/modules/user/househeadedit.vue b/src/views/modules/user/househeadedit.vue
index 95abbb7..1152eb9 100644
--- a/src/views/modules/user/househeadedit.vue
+++ b/src/views/modules/user/househeadedit.vue
@@ -16,13 +16,13 @@
-
+
-
+
-
+
@@ -61,11 +61,11 @@
-
+
-
+
@@ -97,7 +97,7 @@
-
+
@@ -112,10 +112,10 @@
-
+
-
+
@@ -166,15 +166,17 @@
-
-
+
+
-
- {{item.dictName}}
-
+
+
+ {{item.dictName}}
+
+
@@ -226,6 +228,7 @@ export default {
helpStatus: '',
motorVehicleNum: '',
motorVehicleCategory: '',
+ motorVehicleCategoryList: [],
dogStatus: '',
familyMemberNum: '',
familyMemberOutNum: '',
@@ -299,9 +302,6 @@ export default {
helpStatus: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
- motorVehicleNum: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
dogStatus: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
]
@@ -495,9 +495,16 @@ export default {
}
}
}
- if (this.dataForm.motorVehicleNum !== 0 && (this.dataForm.motorVehicleCategory === '' || this.dataForm.motorVehicleCategory === null)) {
+ if (this.dataForm.motorVehicleNum !== 0 && (this.dataForm.motorVehicleCategoryList.length === 0)) {
return this.$message.error('请选择机动车类型')
}
+ let motorVehicleCategoryStr = ''
+ if (this.dataForm.motorVehicleCategoryList.length > 0) {
+ for (let i = 0; i < this.dataForm.motorVehicleCategoryList.length; i++) {
+ motorVehicleCategoryStr += ',' + this.dataForm.motorVehicleCategoryList[i]
+ }
+ }
+ this.dataForm.motorVehicleCategory = motorVehicleCategoryStr.substr(1)
this.dataForm.isSubmit = '0'
this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/populationinformation/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
diff --git a/src/views/modules/user/houseresidentInfo-add-or-update.vue b/src/views/modules/user/houseresidentInfo-add-or-update.vue
index 31d2bd4..79af221 100644
--- a/src/views/modules/user/houseresidentInfo-add-or-update.vue
+++ b/src/views/modules/user/houseresidentInfo-add-or-update.vue
@@ -11,7 +11,7 @@
-
+
@@ -20,13 +20,13 @@
-
+
-
+
-
-
+
+
@@ -86,6 +86,9 @@ export default {
residentsName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
+ houseHeadRelation: [
+ { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+ ],
residentsSex: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
diff --git a/src/views/modules/user/housinginformation-add-or-update.vue b/src/views/modules/user/housinginformation-add-or-update.vue
index 4594528..8437797 100644
--- a/src/views/modules/user/housinginformation-add-or-update.vue
+++ b/src/views/modules/user/housinginformation-add-or-update.vue
@@ -2,7 +2,7 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -91,19 +91,18 @@ export default {
propertyOwnerIdentityNo: '',
propertyOwnerMobile: '',
houseUse: '',
- delFlag: '',
- revision: '',
- createdBy: '',
- createdTime: '',
- updatedBy: '',
- updatedTime: '',
gridId: '',
- parentDeptIds: '',
- parentDeptNames: '',
- allDeptIds: '',
- allDeptNames: '',
+ streetId: '',
+ communityId: '',
deptIdList: [],
- propertyOwnerCard: ''
+ propertyOwnerCard: '',
+ tenantName: '',
+ tenantPhone: '',
+ tenantIdentityNo: '',
+ enterpriseName: '',
+ socialUniformCode: '',
+ legalRepresentative: '',
+ enterprisePhone: ''
},
houseUseFlag: [
{
@@ -197,6 +196,13 @@ export default {
this.getInfo()
} else {
this.deptIdList = []
+ this.dataForm.tenantName = ''
+ this.dataForm.tenantPhone = ''
+ this.dataForm.tenantIdentityNo = ''
+ this.dataForm.enterpriseName = ''
+ this.dataForm.socialUniformCode = ''
+ this.dataForm.legalRepresentative = ''
+ this.dataForm.enterprisePhone = ''
}
})
},
diff --git a/src/views/modules/user/populationMotorVehicle.vue b/src/views/modules/user/populationMotorVehicle.vue
index 7b7e7e4..fb8cf94 100644
--- a/src/views/modules/user/populationMotorVehicle.vue
+++ b/src/views/modules/user/populationMotorVehicle.vue
@@ -72,10 +72,15 @@ export default {
methods: {
setMotorVehicleCategory (row, column) {
if (row.motorVehicleCategory) {
- let dict = this.motorVehicleCategoryList.filter(item => item.dictValue === row.motorVehicleCategory)[0]
- if (dict) {
- return dict.dictName
+ let returnName = ''
+ let motorVehicleCategoryArray = row.motorVehicleCategory.split(',')
+ for (let i = 0; i < motorVehicleCategoryArray.length; i++) {
+ let dict = this.motorVehicleCategoryList.filter(item => item.dictValue === motorVehicleCategoryArray[i])[0]
+ if (dict) {
+ returnName += ',' + dict.dictName
+ }
}
+ return returnName.substr(1)
}
return ''
}