Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev

src/views/ebiz/sale/InsuredInfo.vue

@@ -24,16 +24,8 @@
         @click="toSelect('2')"
       />
       <!-- <van-field v-model="userInfo.idNo" v-validate="'required|idNo'" maxlength="18" label="证件号码" name="证件号码" placeholder="请输入" clearable> -->
-      <van-field
-        v-model="userInfo.idNo"
-        maxlength="18"
-        label="证件号码"
-        name="证件号码"
-        placeholder="请输入"
-        clearable
-        @blur="getRelatedData(userInfo.idNo)"
-      >
-               <van-button v-if="userInfo.idType == 1" slot="button" size="small" type="danger" round @click="selectClick('3')">证件扫描</van-button>
+      <van-field v-model="userInfo.idNo" maxlength="18" label="证件号码" name="证件号码" placeholder="请输入" clearable @blur="getRelatedData(userInfo.idNo)">
+        <van-button v-if="userInfo.idType == 1" slot="button" size="small" type="danger" round @click="selectClick('3')">证件扫描</van-button>
       </van-field>
       <FieldDatePicter
         v-validate="'required'"
@@ -56,20 +48,9 @@
         :flag="true"
       ></FieldDatePicter>
       <div class="border-bt relative fs14 p10 flex align-center">
-        <van-checkbox
-          v-model="userInfo.effectiveDateType"
-          :disabled="effectiveDateTypeAble"
-          @change="effectiveDataTypeChange"
-        >长期</van-checkbox>
+        <van-checkbox v-model="userInfo.effectiveDateType" :disabled="effectiveDateTypeAble" @change="effectiveDataTypeChange">长期</van-checkbox>
       </div>
-      <select-radio
-        :radios="sexRadio"
-        label="性别"
-        name="性别"
-        v-validate="'required'"
-        :required="false"
-        :value.sync="userInfo.sex"
-      ></select-radio>
+      <select-radio :radios="sexRadio" label="性别" name="性别" v-validate="'required'" :required="false" :value.sync="userInfo.sex"></select-radio>
       <van-field
         :value="userInfo.nativeplace | idToText('nativeplace')"
         readonly
@@ -80,16 +61,7 @@
         placeholder="请选择"
         @click="toSelect('1')"
       />
-      <van-field
-        :value="census"
-        readonly
-        label="户籍"
-        name="户籍"
-        v-validate="'required'"
-        right-icon="arrow"
-        placeholder="请选择"
-        @click="censusShow = true"
-      />
+      <van-field :value="census" readonly label="户籍" name="户籍" v-validate="'required'" right-icon="arrow" placeholder="请选择" @click="censusShow = true" />
       <FieldDatePicter
         v-validate="'required'"
         label="出生日期"
@@ -102,46 +74,13 @@
         :maxDate="maxDate"
       ></FieldDatePicter>
 
-      <van-field
-        v-model="userInfo.mobile"
-        clearable
-        label="移动电话"
-        name="移动电话"
-        placeholder="请输入"
-        v-validate="'required|mobile'"
-        maxlength="11"
-      />
-      <van-field
-        v-model="userInfo.authCode"
-        center
-        clearable
-        label
-        name="短信验证码"
-        placeholder="请输入短信验证码"
-        v-validate="'required'"
-        maxlength="6"
-      >
-        <van-button
-          slot="button"
-          size="small"
-          type="danger"
-          @click="getCode"
-          :disabled="codeDisabled"
-          v-no-more-click="1000"
-        >
-          {{
-          codeDisabled ? `${countDown}s后重新获取` : '发送验证码'
-          }}
+      <van-field v-model="userInfo.mobile" clearable label="移动电话" name="移动电话" placeholder="请输入" v-validate="'required|mobile'" maxlength="11" />
+      <van-field v-model="userInfo.authCode" center clearable label name="短信验证码" placeholder="请输入短信验证码" v-validate="'required'" maxlength="6">
+        <van-button slot="button" size="small" type="danger" @click="getCode" :disabled="codeDisabled" v-no-more-click="1000">
+          {{ codeDisabled ? `${countDown}s后重新获取` : '发送验证码' }}
         </van-button>
       </van-field>
-      <van-field
-        v-model="userInfo.email"
-        label="电子邮箱"
-        name="电子邮箱"
-        placeholder="请输入"
-        v-validate="'required|email'"
-        clearable
-      />
+      <van-field v-model="userInfo.email" label="电子邮箱" name="电子邮箱" placeholder="请输入" v-validate="'required|email'" clearable />
       <van-field
         v-model="userInfo.stature"
         label="身高(cm)"
@@ -161,14 +100,15 @@
         clearable
         @blur="checkAvoirdupois(userInfo.avoirdupois)"
       />
+      <!-- <div class="p15 fs14">
+        <van-radio-group v-model="userInfo.IsElecCont" class="flex" @change="radioChange">
+          <label>保单形式</label>
+          <van-radio name="1" class="ml30">电子</van-radio>
+          <van-radio name="2" class="ml20">电子+纸质</van-radio>
+        </van-radio-group>
+      </div> -->
     </van-cell-group>
-    <van-radio-group
-      :border="false"
-      v-model="userInfo.addressStatus"
-      v-validate="'required'"
-      label="设置为联系地址"
-      name="设置为联系地址"
-    >
+    <van-radio-group :border="false" v-model="userInfo.addressStatus" v-validate="'required'" label="设置为联系地址" name="设置为联系地址">
       <!-- 工作信息 -->
       <van-cell-group :border="false">
         <p style=" border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 mt10 pv12">工作信息</p>
@@ -243,14 +183,7 @@
           clearable
           maxlength="5"
         />
-        <van-field
-          v-model="userInfo.liabilitiesMoney"
-          name="负债金额"
-          placeholder="请输入"
-          v-validate="'required|onlyNumber'"
-          clearable
-          maxlength="5"
-        >
+        <van-field v-model="userInfo.liabilitiesMoney" name="负债金额" placeholder="请输入" v-validate="'required|onlyNumber'" clearable maxlength="5">
           <div slot="label" class="flex flex-wrap">
             <span>负债金额</span>
             <span>（万元）</span>
@@ -266,15 +199,7 @@
           right-icon="arrow"
           @click="toSelect('7')"
         />
-        <van-field
-          v-model="userInfo.workcompany"
-          label="工作单位"
-          name="工作单位"
-          placeholder="请输入"
-          v-validate="'required'"
-          maxlength="50"
-          clearable
-        />
+        <van-field v-model="userInfo.workcompany" label="工作单位" name="工作单位" placeholder="请输入" v-validate="'required'" maxlength="50" clearable />
         <van-field
           v-model="areaName"
           readonly
@@ -285,36 +210,13 @@
           v-validate="'required'"
           @click="areaShow = true"
         />
-        <van-field
-          v-model="userInfo.companyAddress"
-          label
-          name="详细地址"
-          placeholder="请输入详细地址"
-          v-validate="'required'"
-          clearable
-          maxlength="30"
-        />
+        <van-field v-model="userInfo.companyAddress" label name="详细地址" placeholder="请输入详细地址" v-validate="'required'" clearable maxlength="30" />
         <div class="border-bt relative fs14 p10 flex align-center">
           <!-- <van-checkbox v-model="companyDefault" :disabled="homeDefault" class="fr" @change="setAddress">设为联系地址</van-checkbox> -->
           <van-radio name="0">设为联系地址</van-radio>
         </div>
-        <van-field
-          v-model="userInfo.companyZip"
-          label="邮编"
-          name="邮编"
-          placeholder="请输入"
-          v-validate="'required|zipCode'"
-          maxlength="6"
-          clearable
-        />
-        <van-field
-          v-model="userInfo.companyPhone"
-          label="单位电话"
-          name="单位电话"
-          placeholder="非必填"
-          maxlength="13"
-          clearable
-        />
+        <van-field v-model="userInfo.companyZip" label="邮编" name="邮编" placeholder="请输入" v-validate="'required|zipCode'" maxlength="6" clearable />
+        <van-field v-model="userInfo.companyPhone" label="单位电话" name="单位电话" placeholder="非必填" maxlength="13" clearable />
       </van-cell-group>
       <!-- 家庭信息 -->
       <van-cell-group>
@@ -348,36 +250,13 @@
           v-validate="'required'"
           @click="homeShow = true"
         />
-        <van-field
-          v-model="userInfo.homeAddress"
-          label
-          name="详细地址"
-          placeholder="请输入详细地址"
-          v-validate="'required'"
-          clearable
-          maxlength="30"
-        />
+        <van-field v-model="userInfo.homeAddress" label name="详细地址" placeholder="请输入详细地址" v-validate="'required'" clearable maxlength="30" />
         <div class="border-bt relative fs14 p10 flex align-center">
           <!-- <van-checkbox v-model="homeDefault" :disabled="companyDefault" class="fr" @change="setAddress">设为联系地址</van-checkbox> -->
           <van-radio name="1">设为联系地址</van-radio>
         </div>
-        <van-field
-          v-model="userInfo.homeZip"
-          label="邮编"
-          name="邮编"
-          placeholder="请输入"
-          v-validate="'required|zipCode'"
-          maxlength="6"
-          clearable
-        />
-        <van-field
-          v-model="userInfo.homePhone"
-          label="家庭电话"
-          name="家庭电话"
-          placeholder="非必填"
-          maxlength="13"
-          clearable
-        />
+        <van-field v-model="userInfo.homeZip" label="邮编" name="邮编" placeholder="请输入" v-validate="'required|zipCode'" maxlength="6" clearable />
+        <van-field v-model="userInfo.homePhone" label="家庭电话" name="家庭电话" placeholder="非必填" maxlength="13" clearable />
       </van-cell-group>
     </van-radio-group>
     <van-button type="danger" class="bottom-btn" @click="nextStep" v-no-more-click="1000">下一步</van-button>
@@ -388,37 +267,20 @@
     </van-popup>
     <!-- 地区选择 -->
     <van-popup v-model="areaShow" position="bottom">
-      <van-area
-        :area-list="areaList"
-        value="110101"
-        @confirm="sureArea($event, '1')"
-        @cancel="areaShow = false"
-      />
+      <van-area :area-list="areaList" value="110101" @confirm="sureArea($event, '1')" @cancel="areaShow = false" />
     </van-popup>
     <!-- 家庭地址选择 -->
     <van-popup v-model="homeShow" position="bottom">
-      <van-area
-        :area-list="areaList"
-        value="110101"
-        @confirm="sureArea($event, '2')"
-        @cancel="homeShow = false"
-      />
+      <van-area :area-list="areaList" value="110101" @confirm="sureArea($event, '2')" @cancel="homeShow = false" />
     </van-popup>
     <!-- 户籍选择 -->
     <van-popup v-model="censusShow" position="bottom">
-      <van-area
-        :area-list="areaList"
-        value="110101"
-        :columns-num="2"
-        @confirm="sureArea($event, '3')"
-        @cancel="censusShow = false"
-      />
+      <van-area :area-list="areaList" value="110101" :columns-num="2" @confirm="sureArea($event, '3')" @cancel="censusShow = false" />
     </van-popup>
     <!--身份证扫描 -->
     <van-popup v-model="isScan" position="bottom">
       <IdentityCardScan @getScanInfo="getIdentityInfo"></IdentityCardScan>
     </van-popup>
-    
   </div>
 </template>
 <script>
@@ -546,7 +408,8 @@ export default {
         homePhone: '', //家庭电话
         householdProvince: '', //户籍省
         householdCity: '', //户籍市
-        addressStatus: '0' //是否是联系地址
+        addressStatus: '0', //是否是联系地址
+        IsElecCont: '1' //保单形式
       },
       areaList: areaList,
       currentPopupIndex: '',
@@ -589,7 +452,6 @@ export default {
       this.userInfo.name = name
     },
     selectClick(index) {
-
       selectComp(this, index, '1')
     },
     // closeBtn() {
@@ -820,6 +682,7 @@ export default {
       this.userInfo.homePhone = data.homePhone //家庭电话
       this.userInfo.householdProvince = data.province //户籍省
       this.userInfo.householdCity = data.city //户籍市
+      this.userInfo.IsElecCont = data.IsElecCont || '1' //保单形式
       if (data.province.length) {
         this.census = getAreaName([{ code: data.province }, { code: data.city }]) //户籍
       }
@@ -836,8 +699,8 @@ export default {
     },
     nextStep() {
       // console.log(this.userInfo.idType)
-    console.log(this.userInfo.salarySource)
-    console.log(this.userInfo.otherSalarySource)
+      console.log(this.userInfo.salarySource)
+      console.log(this.userInfo.otherSalarySource)
       //表单校验, 成功跳转
       this.$validator.validate().then(valid => {
         if (true === valid) {
@@ -940,7 +803,6 @@ export default {
           //   return this.$toast('证件类型为台湾居民通行证的，证件号码须为8位数字')
           // }
 
-
           //投保人需大于等于 16 周岁
           if (age < 16) {
             return this.$toast('投保人必须是具有民事行为能力且有固定职业和收入的自然人，请确定')
@@ -952,8 +814,8 @@ export default {
             return this.$toast('学生不可以作为投保人，请更换投保人投保')
           }
 
-          if(this.userInfo.salarySource == '4'){
-            if(!this.userInfo.otherSalarySource){
+          if (this.userInfo.salarySource == '4') {
+            if (!this.userInfo.otherSalarySource) {
               return this.$toast('请输入其它收入来源')
             }
           }
@@ -1201,11 +1063,16 @@ export default {
       this.effectiveDateTypeAble = idToData(val).age < 45
       this.userInfo.birthday = idToData(val).birthday
       this.userInfo.sex = idToData(val).sex
+    },
+    // 单选按钮切换
+    radioChange(val) {
+      console.log(val)
+      this.userInfo.IsElecCont = val
     }
   },
-  computed:{
-    isShowOthenSalarySource(){
-      if(this.userInfo.salarySource == '4'){
+  computed: {
+    isShowOthenSalarySource() {
+      if (this.userInfo.salarySource == '4') {
         return true
       } else {
         this.userInfo.otherSalarySource = ''