From 0be8b7ea4518f3b3af9c89a29ca2326619535823 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Mon, 7 Sep 2020 08:59:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E9=87=87?=
 =?UTF-8?q?=E9=9B=86-bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/houseFamilyInfo.vue      |  2 +-
 src/views/modules/user/housebusinessinfo.vue    |  6 +++---
 src/views/modules/user/househeadedit.vue        | 17 +++++++++++------
 .../user/houseresidentInfo-add-or-update.vue    |  6 +++++-
 src/views/modules/user/housinginformation.vue   | 10 +++++-----
 .../modules/user/populationInfoOverview.vue     |  6 +++---
 .../modules/user/populationMotorVehicle.vue     |  2 +-
 .../modules/user/populationinformation.vue      |  6 +++---
 8 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/src/views/modules/user/houseFamilyInfo.vue b/src/views/modules/user/houseFamilyInfo.vue
index 66f8a3c..3c4b9b7 100644
--- a/src/views/modules/user/houseFamilyInfo.vue
+++ b/src/views/modules/user/houseFamilyInfo.vue
@@ -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>
diff --git a/src/views/modules/user/housebusinessinfo.vue b/src/views/modules/user/housebusinessinfo.vue
index f95b55b..c553f9d 100644
--- a/src/views/modules/user/housebusinessinfo.vue
+++ b/src/views/modules/user/housebusinessinfo.vue
@@ -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>
diff --git a/src/views/modules/user/househeadedit.vue b/src/views/modules/user/househeadedit.vue
index a120a7d..95abbb7 100644
--- a/src/views/modules/user/househeadedit.vue
+++ b/src/views/modules/user/househeadedit.vue
@@ -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 }) => {
diff --git a/src/views/modules/user/houseresidentInfo-add-or-update.vue b/src/views/modules/user/houseresidentInfo-add-or-update.vue
index ed828c1..31d2bd4 100644
--- a/src/views/modules/user/houseresidentInfo-add-or-update.vue
+++ b/src/views/modules/user/houseresidentInfo-add-or-update.vue
@@ -69,8 +69,12 @@ export default {
           value: '1'
         },
         {
-          label: '其他',
+          label: '父母',
           value: '2'
+        },
+        {
+          label: '其他',
+          value: '3'
         }
       ]
     }
diff --git a/src/views/modules/user/housinginformation.vue b/src/views/modules/user/housinginformation.vue
index c5fcfbb..c3520b0 100644
--- a/src/views/modules/user/housinginformation.vue
+++ b/src/views/modules/user/housinginformation.vue
@@ -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>
diff --git a/src/views/modules/user/populationInfoOverview.vue b/src/views/modules/user/populationInfoOverview.vue
index 0cdeb49..f272d64 100644
--- a/src/views/modules/user/populationInfoOverview.vue
+++ b/src/views/modules/user/populationInfoOverview.vue
@@ -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>
diff --git a/src/views/modules/user/populationMotorVehicle.vue b/src/views/modules/user/populationMotorVehicle.vue
index 4536f28..7b7e7e4 100644
--- a/src/views/modules/user/populationMotorVehicle.vue
+++ b/src/views/modules/user/populationMotorVehicle.vue
@@ -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>
diff --git a/src/views/modules/user/populationinformation.vue b/src/views/modules/user/populationinformation.vue
index 6b625e8..b387fae 100644
--- a/src/views/modules/user/populationinformation.vue
+++ b/src/views/modules/user/populationinformation.vue
@@ -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>