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

居民信息采集-bug修改

feature/syp_points
songyunpeng 5 years ago
parent
322c8fc725
commit
0be8b7ea45
8 changed files with 32 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/modules/user/houseFamilyInfo.vue
  2. 6
      src/views/modules/user/housebusinessinfo.vue
  3. 17
      src/views/modules/user/househeadedit.vue
  4. 6
      src/views/modules/user/houseresidentInfo-add-or-update.vue
  5. 10
      src/views/modules/user/housinginformation.vue
  6. 6
      src/views/modules/user/populationInfoOverview.vue
  7. 2
      src/views/modules/user/populationMotorVehicle.vue
  8. 6
      src/views/modules/user/populationinformation.vue

2
src/views/modules/user/houseFamilyInfo.vue
View File

@ -3,7 +3,7 @@
<div class="mod-news__housebusinessinfo}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="户主姓名">
<el-input v-model="dataForm.residentsName"
<el-input v-model.trim="dataForm.residentsName"
placeholder=""
clearable></el-input>
</el-form-item>

6
src/views/modules/user/housebusinessinfo.vue
View File

@ -3,17 +3,17 @@
<div class="mod-news__housebusinessinfo}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="经营者姓名">
<el-input v-model="dataForm.legalRepresentative"
<el-input v-model.trim="dataForm.legalRepresentative"
placeholder=""
clearable></el-input>
</el-form-item>
<el-form-item label="企业名称">
<el-input v-model="dataForm.enterpriseName"
<el-input v-model.trim="dataForm.enterpriseName"
placeholder=""
clearable></el-input>
</el-form-item>
<el-form-item label="企业注册号">
<el-input v-model="dataForm.socialUniformCode"
<el-input v-model.trim="dataForm.socialUniformCode"
placeholder=""
clearable></el-input>
</el-form-item>

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

@ -138,7 +138,7 @@
<el-radio label="1">是</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="失业登记时间" prop="unemploymentRegisterTime" v-if="dataForm.employmentStatus === '1'">
<el-form-item label="失业登记时间" prop="unemploymentRegisterTime" v-if="dataForm.employmentStatus === '1' && dataForm.unemploymentRegister === '1'">
<el-date-picker
v-model="dataForm.unemploymentRegisterTime"
type="date"
@ -302,9 +302,6 @@ export default {
motorVehicleNum: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
motorVehicleCategory: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
dogStatus: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
]
@ -487,11 +484,19 @@ export default {
}
if (this.dataForm.employmentStatus === '1') {
if (this.dataForm.unemploymentReason === '' || this.dataForm.unemploymentRegister === '' ||
this.dataForm.reemploymentPermit === '' || this.dataForm.unemploymentRegisterTime === '' ||
this.dataForm.reemploymentPermit === '' ||
this.dataForm.unemploymentReason === null || this.dataForm.unemploymentRegister === null ||
this.dataForm.reemploymentPermit === null || this.dataForm.unemploymentRegisterTime === null) {
this.dataForm.reemploymentPermit === null) {
return this.$message.error('请填写详细失业信息！')
}
if (this.dataForm.unemploymentRegister === '1') {
if (this.dataForm.unemploymentRegisterTime === '' || this.dataForm.unemploymentRegisterTime === null) {
return this.$message.error('请填写失业登记时间')
}
}
}
if (this.dataForm.motorVehicleNum !== 0 && (this.dataForm.motorVehicleCategory === '' || this.dataForm.motorVehicleCategory === null)) {
return this.$message.error('请选择机动车类型')
}
this.dataForm.isSubmit = '0'
this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/populationinformation/', this.dataForm).then(({ data: res }) => {

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

@ -69,8 +69,12 @@ export default {
value: '1'
},
{
label: '其他',
label: '父母',
value: '2'
},
{
label: '其他',
value: '3'
}
]
}

10
src/views/modules/user/housinginformation.vue
View File

@ -3,17 +3,17 @@
<div class="mod-news__housinginformation}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="房屋地址">
<el-input v-model="dataForm.houseAddress"
<el-input v-model.trim="dataForm.houseAddress"
placeholder=""
clearable></el-input>
</el-form-item>
<el-form-item label="产权人">
<el-input v-model="dataForm.propertyOwner"
<el-input v-model.trim="dataForm.propertyOwner"
placeholder=""
clearable></el-input>
</el-form-item>
<el-form-item label="联系电话">
<el-input v-model="dataForm.propertyOwnerMobile"
<el-input v-model.trim="dataForm.propertyOwnerMobile"
placeholder=""
clearable></el-input>
</el-form-item>
@ -69,12 +69,12 @@
<el-table-column prop="propertyOwner" label="产权人" header-align="center" align="center"></el-table-column>
<el-table-column prop="propertyOwnerMobile" label="联系电话" header-align="center" align="center"></el-table-column>
<el-table-column prop="propertyOwnerIdentityNo" label="身份证号" header-align="center" align="center" width="180px"></el-table-column>
<el-table-column label="房屋信息" fixed="right" header-align="center" align="center" width="150">
<el-table-column label="房屋信息" fixed="right" header-align="center" align="center" width="90">
<template slot-scope="scope">
<el-button type="text" size="small" @click="lookHouseInfo(scope.row.id)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="居住人信息" fixed="right" header-align="center" align="center" width="150">
<el-table-column label="居住人信息" fixed="right" header-align="center" align="center" width="95">
<template slot-scope="scope">
<el-button type="text" size="small" @click="lookResidentInfo(scope.row.id)">查看</el-button>
</template>

6
src/views/modules/user/populationInfoOverview.vue
View File

@ -7,12 +7,12 @@
<td>
<p class="item">居住类型统计</p>
<div id="houseUse"
:style="{width: '600px', height: '325px'}"></div>
:style="{width: '600px', height: '290px'}"></div>
</td>
<td>
<p class="item">数据量统计</p>
<div
style="width: 600px;height: 325px">
style="width: 600px;height: 290px">
<div class="houseInfo" style="width: 300px;height: 200px;margin-left: 50px;margin-top: 30px">
<table style=" border-spacing:0px 10px">
<tr>
@ -45,7 +45,7 @@
<td>
<p class="item">人员就业情况</p>
<div id="employStatus"
:style="{width: '600px', height: '325px'}"></div>
:style="{width: '600px', height: '290px'}"></div>
</td>
<td></td>
</tr>

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

@ -13,7 +13,7 @@
</el-select>
</el-form-item>
<el-form-item label="车主姓名">
<el-input v-model="dataForm.residentsName"
<el-input v-model.trim="dataForm.residentsName"
placeholder=""
clearable></el-input>
</el-form-item>

6
src/views/modules/user/populationinformation.vue
View File

@ -3,17 +3,17 @@
<div class="mod-news__populationinformation}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="姓名">
<el-input v-model="dataForm.residentsName"
<el-input v-model.trim="dataForm.residentsName"
placeholder=""
clearable></el-input>
</el-form-item>
<el-form-item label="联系电话">
<el-input v-model="dataForm.residentsPhone"
<el-input v-model.trim="dataForm.residentsPhone"
placeholder=""
clearable></el-input>
</el-form-item>
<el-form-item label="身份证号">
<el-input v-model="dataForm.residentsIdentityNo"
<el-input v-model.trim="dataForm.residentsIdentityNo"
placeholder=""
clearable></el-input>
</el-form-item>

Write Preview
Loading…
Cancel
Save