elink-star
/
esua-epdc-admin-js
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

居民信息采集-bug修改

feature/syp_points
songyunpeng 5 years ago
parent
106b56e9e8
commit
a1ddef7aeb
4 changed files with 71 additions and 50 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. 43
      src/views/modules/user/househeadedit.vue
  2. 13
      src/views/modules/user/houseresidentInfo-add-or-update.vue
  3. 52
      src/views/modules/user/housinginformation-add-or-update.vue
  4. 9
      src/views/modules/user/populationMotorVehicle.vue

43
src/views/modules/user/househeadedit.vue
View File

@ -16,13 +16,13 @@
</el-form-item> </el-form-item>
<br> <br>
<el-form-item label="户主姓名" prop="residentsName" > <el-form-item label="户主姓名" prop="residentsName" >
<el-input v-model="dataForm.residentsName" placeholder="姓名"></el-input> <el-input v-model.trim="dataForm.residentsName" placeholder="姓名" maxlength="10" show-word-limit></el-input>
</el-form-item> </el-form-item>
<el-form-item label="民族" prop="residentsNation"> <el-form-item label="民族" prop="residentsNation">
<el-input v-model="dataForm.residentsNation" placeholder="民族"></el-input> <el-input v-model.trim="dataForm.residentsNation" placeholder="民族" maxlength="10" show-word-limit></el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证号码" prop="residentsIdentityNo" > <el-form-item label="身份证号码" prop="residentsIdentityNo" >
<el-input v-model="dataForm.residentsIdentityNo" placeholder="身份证号码" @blur="getSexAndBirthDay"></el-input> <el-input v-model.trim="dataForm.residentsIdentityNo" placeholder="身份证号码" @blur="getSexAndBirthDay" maxlength="18" show-word-limit></el-input>
</el-form-item> </el-form-item>
<el-form-item label="性别" prop="residentsSex"> <el-form-item label="性别" prop="residentsSex">
@ -61,11 +61,11 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="组织关系所在地" prop="organizationalRelationshipLocation" v-if="dataForm.politicsStatus === '1'"> <el-form-item label="组织关系所在地" prop="organizationalRelationshipLocation" v-if="dataForm.politicsStatus === '1'">
<el-input v-model="dataForm.organizationalRelationshipLocation" placeholder="组织关系所在地"></el-input> <el-input v-model="dataForm.organizationalRelationshipLocation" placeholder="组织关系所在地" maxlength="20" show-word-limit></el-input>
</el-form-item> </el-form-item>
<el-form-item label="联系电话" prop="residentsPhone"> <el-form-item label="联系电话" prop="residentsPhone">
<el-input v-model="dataForm.residentsPhone" placeholder="联系电话"></el-input> <el-input v-model.trim="dataForm.residentsPhone" placeholder="联系电话" maxlength="20" show-word-limit></el-input>
</el-form-item> </el-form-item>
<br> <br>
<el-form-item label="身体状况" prop="bodyStatus"> <el-form-item label="身体状况" prop="bodyStatus">
@ -97,7 +97,7 @@
</el-form-item> </el-form-item>
<br> <br>
<el-form-item label="户籍地" prop="householdRegistrationPlace"> <el-form-item label="户籍地" prop="householdRegistrationPlace">
<el-input v-model="dataForm.householdRegistrationPlace" placeholder="户籍地" style="width: 500px"></el-input> <el-input v-model.trim="dataForm.householdRegistrationPlace" placeholder="户籍地" style="width: 500px" maxlength="30" show-word-limit></el-input>
</el-form-item> </el-form-item>
<br> <br>
<hr> <hr>
@ -112,10 +112,10 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="现工作单位" prop="currentEmployer" v-if="dataForm.employmentStatus === '0'"> <el-form-item label="现工作单位" prop="currentEmployer" v-if="dataForm.employmentStatus === '0'">
<el-input v-model="dataForm.currentEmployer" placeholder="现工作单位"></el-input> <el-input v-model.trim="dataForm.currentEmployer" placeholder="现工作单位" maxlength="30" show-word-limit></el-input>
</el-form-item> </el-form-item>
<el-form-item label="现单位地址" prop="currentEmployerAddress" v-if="dataForm.employmentStatus === '0'"> <el-form-item label="现单位地址" prop="currentEmployerAddress" v-if="dataForm.employmentStatus === '0'">
<el-input v-model="dataForm.currentEmployerAddress" placeholder="现单位地址"></el-input> <el-input v-model.trim="dataForm.currentEmployerAddress" placeholder="现单位地址" maxlength="30" show-word-limit></el-input>
</el-form-item> </el-form-item>
<br> <br>
<el-form-item label="失业原因" prop="unemploymentReason" v-if="dataForm.employmentStatus === '1'"> <el-form-item label="失业原因" prop="unemploymentReason" v-if="dataForm.employmentStatus === '1'">
@ -166,15 +166,17 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<br> <br>
<el-form-item label="机动车数量" prop="motorVehicleNum"> <el-form-item label="机动车数量">
<el-input-number v-model="dataForm.motorVehicleNum" placeholder="机动车数量"></el-input-number> <el-input-number v-model="dataForm.motorVehicleNum" placeholder="机动车数量" :min="0"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="机动车类型" prop="motorVehicleCategory"> <el-form-item label="机动车类型" prop="motorVehicleCategory">
<el-radio-group v-model="dataForm.motorVehicleCategory"> <el-checkbox-group v-model="dataForm.motorVehicleCategoryList">
<el-radio v-for="item in motorVehicleCategoryList" <el-checkbox v-for="item in motorVehicleCategoryList"
:key="item.dictValue" :key="item.dictValue"
:label="item.dictValue">{{item.dictName}}</el-radio> :label="item.dictValue">
</el-radio-group> {{item.dictName}}
</el-checkbox>
</el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item label="宠物犬状况" prop="dogStatus"> <el-form-item label="宠物犬状况" prop="dogStatus">
<el-radio-group v-model="dataForm.dogStatus"> <el-radio-group v-model="dataForm.dogStatus">
@ -226,6 +228,7 @@ export default {
helpStatus: '', helpStatus: '',
motorVehicleNum: '', motorVehicleNum: '',
motorVehicleCategory: '', motorVehicleCategory: '',
motorVehicleCategoryList: [],
dogStatus: '', dogStatus: '',
familyMemberNum: '', familyMemberNum: '',
familyMemberOutNum: '', familyMemberOutNum: '',
@ -299,9 +302,6 @@ export default {
helpStatus: [ helpStatus: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
], ],
motorVehicleNum: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
dogStatus: [ dogStatus: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { 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('请选择机动车类型') 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.dataForm.isSubmit = '0'
this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/populationinformation/', this.dataForm).then(({ data: res }) => { this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/populationinformation/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {

13
src/views/modules/user/houseresidentInfo-add-or-update.vue
View File

@ -11,7 +11,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="姓名" prop="residentsName" > <el-form-item label="姓名" prop="residentsName" >
<el-input v-model="dataForm.residentsName" placeholder="姓名"></el-input> <el-input v-model.trim="dataForm.residentsName" placeholder="姓名" maxlength="10" show-word-limit></el-input>
</el-form-item> </el-form-item>
<el-form-item label="性别" prop="residentsSex"> <el-form-item label="性别" prop="residentsSex">
<el-radio-group v-model="dataForm.residentsSex"> <el-radio-group v-model="dataForm.residentsSex">
@ -20,13 +20,13 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="民族" prop="residentsNation"> <el-form-item label="民族" prop="residentsNation">
<el-input v-model="dataForm.residentsNation" placeholder="民族"></el-input> <el-input v-model.trim="dataForm.residentsNation" placeholder="民族" maxlength="10" show-word-limit></el-input>
</el-form-item> </el-form-item>
<el-form-item label="工作单位/学校" prop="currentEmployer"> <el-form-item label="工作单位/学校" prop="currentEmployer">
<el-input v-model="dataForm.currentEmployer" placeholder="工作单位/学校"></el-input> <el-input v-model.trim="dataForm.currentEmployer" placeholder="工作单位/学校" maxlength="30" show-word-limit></el-input>
</el-form-item> </el-form-item>
<el-form-item label="现居住地址单位" prop="currentAddress"> <el-form-item label="现居住地址" prop="currentAddress">
<el-input v-model="dataForm.currentAddress" placeholder="现工作单位"></el-input> <el-input v-model.trim="dataForm.currentAddress" placeholder="现居住地址" maxlength="30" show-word-limit></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template slot="footer"> <template slot="footer">
@ -86,6 +86,9 @@ export default {
residentsName: [ residentsName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
], ],
houseHeadRelation: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
residentsSex: [ residentsSex: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
], ],

52
src/views/modules/user/housinginformation-add-or-update.vue
View File

@ -2,7 +2,7 @@
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false"> <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
<el-form-item label="房屋地址" prop="houseAddress"> <el-form-item label="房屋地址" prop="houseAddress">
<el-input v-model="dataForm.houseAddress" placeholder="房屋地址"></el-input> <el-input v-model.trim="dataForm.houseAddress" placeholder="房屋地址" maxlength="30" show-word-limit></el-input>
</el-form-item> </el-form-item>
<el-form-item label="购房时间" prop="buyingTime"> <el-form-item label="购房时间" prop="buyingTime">
<el-date-picker <el-date-picker
@ -15,16 +15,16 @@
<el-input-number v-model="dataForm.houseArea" placeholder="房屋面积" :min="1"></el-input-number> <el-input-number v-model="dataForm.houseArea" placeholder="房屋面积" :min="1"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="产权人" prop="propertyOwner"> <el-form-item label="产权人" prop="propertyOwner">
<el-input v-model="dataForm.propertyOwner" placeholder="产权人"></el-input> <el-input v-model.trim="dataForm.propertyOwner" placeholder="产权人" maxlength="10" show-word-limit></el-input>
</el-form-item> </el-form-item>
<el-form-item label="产权人联系电话" prop="propertyOwnerMobile"> <el-form-item label="产权人联系电话" prop="propertyOwnerMobile">
<el-input v-model="dataForm.propertyOwnerMobile" placeholder="联系电话"></el-input> <el-input v-model.trim="dataForm.propertyOwnerMobile" placeholder="联系电话" maxlength="20" show-word-limit></el-input>
</el-form-item> </el-form-item>
<el-form-item label="产权人身份证号" prop="propertyOwnerIdentityNo"> <el-form-item label="产权人身份证号" prop="propertyOwnerIdentityNo">
<el-input v-model="dataForm.propertyOwnerIdentityNo" placeholder="产权人身份证号"></el-input> <el-input v-model.trim="dataForm.propertyOwnerIdentityNo" placeholder="产权人身份证号" maxlength="18" show-word-limit></el-input>
</el-form-item> </el-form-item>
<el-form-item label="产权证" prop="propertyOwnerCard"> <el-form-item label="产权证" prop="propertyOwnerCard">
<el-input v-model="dataForm.propertyOwnerCard" placeholder="产权证"></el-input> <el-input v-model.trim="dataForm.propertyOwnerCard" placeholder="产权证" maxlength="20" show-word-limit></el-input>
</el-form-item> </el-form-item>
<el-form-item label="所属网格"> <el-form-item label="所属网格">
<el-cascader v-model="deptIdList" <el-cascader v-model="deptIdList"
@ -45,27 +45,27 @@
</el-form-item> </el-form-item>
<div v-if="dataForm.houseUse === '1'"> <div v-if="dataForm.houseUse === '1'">
<el-form-item label="承租人姓名" prop="tenantName"> <el-form-item label="承租人姓名" prop="tenantName">
<el-input v-model="dataForm.tenantName" placeholder="承租人姓名"></el-input> <el-input v-model.trim="dataForm.tenantName" placeholder="承租人姓名" maxlength="10" show-word-limit></el-input>
</el-form-item> </el-form-item>
<el-form-item label="承租人电话" prop="tenantPhone"> <el-form-item label="承租人电话" prop="tenantPhone">
<el-input v-model="dataForm.tenantPhone" placeholder="承租人电话"></el-input> <el-input v-model.trim="dataForm.tenantPhone" placeholder="承租人电话" maxlength="20" show-word-limit></el-input>
</el-form-item> </el-form-item>
<el-form-item label="承租人身份证号" prop="tenantIdentityNo"> <el-form-item label="承租人身份证号" prop="tenantIdentityNo">
<el-input v-model="dataForm.tenantIdentityNo" placeholder="承租人身份证号"></el-input> <el-input v-model.trim="dataForm.tenantIdentityNo" placeholder="承租人身份证号" maxlength="18" show-word-limit></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div v-if="dataForm.houseUse === '2'"> <div v-if="dataForm.houseUse === '2'">
<el-form-item label="企业名称" prop="enterpriseName"> <el-form-item label="企业名称" prop="enterpriseName">
<el-input v-model="dataForm.enterpriseName" placeholder="企业名称"></el-input> <el-input v-model.trim="dataForm.enterpriseName" placeholder="企业名称" maxlength="30" show-word-limit></el-input>
</el-form-item> </el-form-item>
<el-form-item label="社会统一代码" prop="socialUniformCode"> <el-form-item label="社会统一代码" prop="socialUniformCode">
<el-input v-model="dataForm.socialUniformCode" placeholder="社会统一代码"></el-input> <el-input v-model.trim="dataForm.socialUniformCode" placeholder="社会统一代码" maxlength="30" show-word-limit></el-input>
</el-form-item> </el-form-item>
<el-form-item label="法人代表" prop="legalRepresentative"> <el-form-item label="法人代表" prop="legalRepresentative">
<el-input v-model="dataForm.legalRepresentative" placeholder="法人代表"></el-input> <el-input v-model.trim="dataForm.legalRepresentative" placeholder="法人代表" maxlength="10" show-word-limit></el-input>
</el-form-item> </el-form-item>
<el-form-item label="电话" prop="enterprisePhone"> <el-form-item label="电话" prop="enterprisePhone">
<el-input v-model="dataForm.enterprisePhone" placeholder="电话"></el-input> <el-input v-model.trim="dataForm.enterprisePhone" placeholder="电话" maxlength="20" show-word-limit></el-input>
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
@ -91,19 +91,18 @@ export default {
propertyOwnerIdentityNo: '', propertyOwnerIdentityNo: '',
propertyOwnerMobile: '', propertyOwnerMobile: '',
houseUse: '', houseUse: '',
delFlag: '',
revision: '',
createdBy: '',
createdTime: '',
updatedBy: '',
updatedTime: '',
gridId: '', gridId: '',
parentDeptIds: '', streetId: '',
parentDeptNames: '', communityId: '',
allDeptIds: '',
allDeptNames: '',
deptIdList: [], deptIdList: [],
propertyOwnerCard: '' propertyOwnerCard: '',
tenantName: '',
tenantPhone: '',
tenantIdentityNo: '',
enterpriseName: '',
socialUniformCode: '',
legalRepresentative: '',
enterprisePhone: ''
}, },
houseUseFlag: [ houseUseFlag: [
{ {
@ -197,6 +196,13 @@ export default {
this.getInfo() this.getInfo()
} else { } else {
this.deptIdList = [] this.deptIdList = []
this.dataForm.tenantName = ''
this.dataForm.tenantPhone = ''
this.dataForm.tenantIdentityNo = ''
this.dataForm.enterpriseName = ''
this.dataForm.socialUniformCode = ''
this.dataForm.legalRepresentative = ''
this.dataForm.enterprisePhone = ''
} }
}) })
}, },

9
src/views/modules/user/populationMotorVehicle.vue
View File

@ -72,11 +72,16 @@ export default {
methods: { methods: {
setMotorVehicleCategory (row, column) { setMotorVehicleCategory (row, column) {
if (row.motorVehicleCategory) { if (row.motorVehicleCategory) {
let dict = this.motorVehicleCategoryList.filter(item => item.dictValue === row.motorVehicleCategory)[0] 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) { if (dict) {
return dict.dictName returnName += ',' + dict.dictName
} }
} }
return returnName.substr(1)
}
return '' return ''
} }
} }

Write Preview
Loading…
Cancel
Save