From a1ddef7aeb7e864e5efce261c801099599484daa Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Tue, 8 Sep 2020 17:37:31 +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/househeadedit.vue      | 45 +++++++++-------
 .../user/houseresidentInfo-add-or-update.vue  | 13 +++--
 .../user/housinginformation-add-or-update.vue | 52 +++++++++++--------
 .../modules/user/populationMotorVehicle.vue   | 11 ++--
 4 files changed, 71 insertions(+), 50 deletions(-)

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 @@
       </el-form-item>
       <br>
       <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 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 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 label="性别" prop="residentsSex">
@@ -61,11 +61,11 @@
             </el-date-picker>
           </el-form-item>
           <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 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>
       <br>
           <el-form-item label="身体状况" prop="bodyStatus">
@@ -97,7 +97,7 @@
           </el-form-item>
       <br>
           <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>
       <br>
       <hr>
@@ -112,10 +112,10 @@
             </el-radio-group>
           </el-form-item>
           <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 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>
       <br>
           <el-form-item label="失业原因" prop="unemploymentReason" v-if="dataForm.employmentStatus === '1'">
@@ -166,15 +166,17 @@
             </el-radio-group>
           </el-form-item>
       <br>
-          <el-form-item label="机动车数量" prop="motorVehicleNum">
-            <el-input-number v-model="dataForm.motorVehicleNum" placeholder="机动车数量"></el-input-number>
+          <el-form-item label="机动车数量">
+            <el-input-number v-model="dataForm.motorVehicleNum" placeholder="机动车数量" :min="0"></el-input-number>
       </el-form-item>
           <el-form-item label="机动车类型" prop="motorVehicleCategory">
-            <el-radio-group v-model="dataForm.motorVehicleCategory">
-              <el-radio  v-for="item in motorVehicleCategoryList"
-                         :key="item.dictValue"
-                         :label="item.dictValue">{{item.dictName}}</el-radio>
-            </el-radio-group>
+            <el-checkbox-group v-model="dataForm.motorVehicleCategoryList">
+              <el-checkbox v-for="item in motorVehicleCategoryList"
+                           :key="item.dictValue"
+                           :label="item.dictValue">
+                {{item.dictName}}
+              </el-checkbox>
+            </el-checkbox-group>
           </el-form-item>
           <el-form-item label="宠物犬状况" prop="dogStatus">
             <el-radio-group v-model="dataForm.dogStatus">
@@ -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 @@
         </el-select>
       </el-form-item>
       <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 label="性别" prop="residentsSex">
         <el-radio-group v-model="dataForm.residentsSex">
@@ -20,13 +20,13 @@
         </el-radio-group>
       </el-form-item>
       <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 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 label="现居住地址单位" prop="currentAddress">
-        <el-input v-model="dataForm.currentAddress" placeholder="现工作单位"></el-input>
+      <el-form-item label="现居住地址" prop="currentAddress">
+        <el-input v-model.trim="dataForm.currentAddress" placeholder="现居住地址" maxlength="30" show-word-limit></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
@@ -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 @@
   <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-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 label="购房时间" prop="buyingTime">
             <el-date-picker
@@ -15,16 +15,16 @@
           <el-input-number v-model="dataForm.houseArea" placeholder="房屋面积" :min="1"></el-input-number>
       </el-form-item>
           <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 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 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 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 label="所属网格">
         <el-cascader v-model="deptIdList"
@@ -45,27 +45,27 @@
       </el-form-item>
       <div v-if="dataForm.houseUse === '1'">
         <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 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 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>
       </div>
       <div v-if="dataForm.houseUse === '2'">
         <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 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 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 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>
       </div>
       </el-form>
@@ -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 ''
     }