From ad3b90b79f4dbf6e5caafc68cb98c1db4e91fa17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Tue, 19 Nov 2019 16:42:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=A2=9E=E5=8A=A0=E5=BF=85?=
 =?UTF-8?q?=E9=A1=BB=E6=98=9F=E5=8F=B7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/AddBeneficiaryInfo.vue | 18 +++++++--
 src/views/ebiz/sale/InsuredInfo.vue        | 44 ++++++++++++++++------
 src/views/ebiz/sale/InsuredPerson.vue      | 38 ++++++++++++++++---
 3 files changed, 80 insertions(+), 20 deletions(-)

diff --git a/src/views/ebiz/sale/AddBeneficiaryInfo.vue b/src/views/ebiz/sale/AddBeneficiaryInfo.vue
index 00c94570a..4bad1ec85 100644
--- a/src/views/ebiz/sale/AddBeneficiaryInfo.vue
+++ b/src/views/ebiz/sale/AddBeneficiaryInfo.vue
@@ -5,6 +5,7 @@
       <van-field
         v-model="relationToAppnt"
         readonly
+        required
         label="是被保人的"
         name="是被保人的"
         right-icon="arrow"
@@ -17,6 +18,7 @@
         v-validate="'required|name'"
         name="姓名"
         label="姓名"
+        required
         :value.sync="userInfo.name"
         :parentShowPicker.sync="customerShowPicker"
         @nameChange="nameChange"
@@ -27,6 +29,7 @@
         :value="userInfo.idType | idToText('idType')"
         v-validate="'required'"
         readonly
+        required
         label="证件类型"
         name="证件类型"
         right-icon="arrow"
@@ -38,6 +41,7 @@
         v-model="userInfo.idNo"
         label="证件号码"
         name="证件号码"
+        required
         placeholder="请输入"
         maxlength="18"
         clearable
@@ -50,6 +54,7 @@
         v-validate="'required'"
         label="出生日期"
         name="出生日期"
+        required
         :value.sync="userInfo.birthday"
         type="date"
         :flag="true"
@@ -61,6 +66,7 @@
         v-validate="'required'"
         label="证件起始日期"
         name="证件起始日期"
+        required
         :value.sync="userInfo.certificateValidate"
         type="date"
         :defaultDate="new Date()"
@@ -73,6 +79,7 @@
         :v-validate="{ required: certiexpiredateRequired }"
         label="证件截止日期"
         name="证件截止日期"
+        required
         :defaultDate="new Date()"
         :value.sync="userInfo.certiexpiredate"
         type="date"
@@ -85,12 +92,13 @@
         <van-checkbox v-model="userInfo.effectiveDateType" class="fr" :disabled="effectiveDateTypeAble" @change="effectiveDataTypeChange">长期</van-checkbox>
       </div>
       <!-- <van-field v-model="userInfo.name" label="姓名" name="姓名" placeholder="请输入" v-validate="'required|name'" :readonly="isInsured" /> -->
-      <select-radio :radios="sexRadio" :required="false" label="性别" :value.sync="userInfo.sex" :disabled="isInsured"></select-radio>
+      <select-radio :radios="sexRadio" required label="性别" :value.sync="userInfo.sex" :disabled="isInsured"></select-radio>
       <van-field
         :value="userInfo.nativeplace | idToText('nativeplace')"
         readonly
         label="国家/地区"
         name="国家/地区"
+        required
         v-validate="'required'"
         right-icon="arrow"
         placeholder="请选择"
@@ -101,6 +109,7 @@
         clearable
         label="联系电话"
         name="联系电话"
+        required
         placeholder="请输入"
         v-validate="'required|mobile'"
         maxlength="11"
@@ -111,6 +120,7 @@
         readonly
         label="联系地址"
         name="联系地址"
+        required
         right-icon="arrow"
         placeholder="请选择"
         v-validate="'required'"
@@ -129,7 +139,7 @@
       <div class="relative border-bt fs14 p10 flex align-center">
         <van-checkbox v-model="userInfo.asAppntAddress" @change="asAppntAddress" :disabled="isInsured">同投保人</van-checkbox>
       </div>
-      <van-field v-model="userInfo.email" label="电子邮箱" name="电子邮箱" placeholder="请输入" v-validate="'required|email'" clearable :readonly="isInsured" />
+      <van-field v-model="userInfo.email" required label="电子邮箱" name="电子邮箱" placeholder="请输入" v-validate="'required|email'" clearable :readonly="isInsured" />
       <occupation-picker
         :value.sync="userInfo.occupationCode"
         :chooseName.sync="userInfo.occupationName"
@@ -138,18 +148,20 @@
         clearable
         label="职业类别"
         name="职业类别"
+        required
         v-validate="'required'"
         placeholder="请选择"
         :parentShowPicker.sync="occupationShowPicker"
         @on-click="selectClick('2')"
         @on-choose="chooseOccupation"
       />
-      <van-field v-model="userInfo.bnfOrder" readonly label="受益顺序" name="受益顺序" placeholder="请输入" v-validate="'required|onlyNumber'" maxlength="1" />
+      <van-field v-model="userInfo.bnfOrder" required readonly label="受益顺序" name="受益顺序" placeholder="请输入" v-validate="'required|onlyNumber'" maxlength="1" />
       <van-field
         v-model="userInfo.bnfLot"
         label="受益比例(%)"
         name="受益比例"
         placeholder="请输入"
+        required
         v-validate="'required|onlyNumber'"
         maxlength="3"
         clearable
diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue
index 3ab5c75d4..f79d61333 100644
--- a/src/views/ebiz/sale/InsuredInfo.vue
+++ b/src/views/ebiz/sale/InsuredInfo.vue
@@ -8,6 +8,7 @@
         v-validate="'required|name'"
         name="姓名"
         label="姓名"
+        required
         :parentShowPicker.sync="customerShowPicker"
         :value.sync="userInfo.name"
         @nameChange="nameChange"
@@ -17,6 +18,7 @@
         :value="userInfo.idType | idToText('insuredIdType')"
         v-validate="'required'"
         readonly
+        required
         label="证件类型"
         name="证件类型"
         right-icon="arrow"
@@ -24,13 +26,14 @@
         @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-field v-model="userInfo.idNo" maxlength="18" required 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'"
         label="证件起始日期"
         name="证件起始日期"
+        required
         :value.sync="userInfo.certificateValidate"
         type="date"
         @confirm="onDateConfirm($event, '0')"
@@ -41,6 +44,7 @@
         :v-validate="{ required: certiexpiredateRequired }"
         label="证件截止日期"
         name="证件截止日期"
+        required
         :value.sync="userInfo.certiexpiredate"
         type="date"
         @confirm="onDateConfirm($event, '1')"
@@ -50,10 +54,11 @@
       <div class="border-bt relative fs14 p10 flex align-center">
         <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 required :radios="sexRadio" label="性别" name="性别" v-validate="'required'" :value.sync="userInfo.sex"></select-radio>
       <van-field
         :value="userInfo.nativeplace | idToText('nativeplace')"
         readonly
+        required
         label="国家/地区"
         name="国家/地区"
         v-validate="'required'"
@@ -61,11 +66,12 @@
         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" required readonly label="户籍" name="户籍" v-validate="'required'" right-icon="arrow" placeholder="请选择" @click="censusShow = true" />
       <FieldDatePicter
         v-validate="'required'"
         label="出生日期"
         name="出生日期"
+        required
         :value.sync="userInfo.birthday"
         type="date"
         :flag="true"
@@ -74,17 +80,18 @@
         :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-field required 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" required label="电子邮箱" name="电子邮箱" placeholder="请输入" v-validate="'required|email'" clearable />
       <van-field
         v-model="userInfo.stature"
         label="身高(cm)"
         name="身高"
+        required
         placeholder="请输入"
         v-validate="'required|onlyNumber|stature'"
         clearable
@@ -95,6 +102,7 @@
         v-model="userInfo.avoirdupois"
         label="体重(kg)"
         name="体重"
+        required
         placeholder="请输入"
         v-validate="'required|onlyNumber|avoirdupois'"
         clearable
@@ -117,6 +125,7 @@
           readonly
           label="文化程度"
           name="文化程度"
+          required
           right-icon="arrow"
           placeholder="请选择"
           v-validate="'required'"
@@ -128,6 +137,7 @@
           :required="false"
           label="有无社保"
           name="有无社保"
+          required
           :value.sync="userInfo.medical"
         ></select-radio>
         <van-field
@@ -135,6 +145,7 @@
           readonly
           label="税收居民身份"
           name="税收居民身份"
+          required
           right-icon="arrow"
           placeholder="请选择"
           v-validate="'required'"
@@ -149,6 +160,7 @@
           clearable
           label="职业类别"
           name="职业类别"
+          required
           v-validate="'required'"
           placeholder="请选择"
           :parentShowPicker.sync="occupationShowPicker"
@@ -160,6 +172,7 @@
           readonly
           label="收入来源"
           name="收入来源"
+          required
           right-icon="arrow"
           placeholder="请选择"
           v-validate="'required'"
@@ -169,6 +182,7 @@
           v-show="isShowOthenSalarySource"
           v-model="userInfo.otherSalarySource"
           label
+          required
           name="其他来源"
           placeholder="请输入其它收入来源"
           clearable
@@ -178,12 +192,13 @@
           v-model="userInfo.averageAnnualIncome"
           label="平均年收入（万元）"
           name="平均年收入"
+          required
           placeholder="请输入"
           v-validate="'required|onlyNumber'"
           clearable
           maxlength="5"
         />
-        <van-field v-model="userInfo.liabilitiesMoney" name="负债金额" placeholder="请输入" v-validate="'required|onlyNumber'" clearable maxlength="5">
+        <van-field v-model="userInfo.liabilitiesMoney" required name="负债金额" placeholder="请输入" v-validate="'required|onlyNumber'" clearable maxlength="5">
           <div slot="label" class="flex flex-wrap">
             <span>负债金额</span>
             <span>（万元）</span>
@@ -192,6 +207,7 @@
         <van-field
           :value="userInfo.jobStatus | idToText('workCondition')"
           readonly
+          required
           label="在职情况"
           name="在职情况"
           placeholder="请选择"
@@ -199,23 +215,24 @@
           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" required label="工作单位" name="工作单位" placeholder="请输入" v-validate="'required'" maxlength="50" clearable />
         <van-field
           v-model="areaName"
           readonly
           label="单位地址"
           name="单位地址"
+          required
           right-icon="arrow"
           placeholder="请选择"
           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.companyZip" required 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>
       <!-- 家庭信息 -->
@@ -224,6 +241,7 @@
         <van-field
           :value="userInfo.marriage | idToText('marriage')"
           readonly
+          required
           label="婚姻状况"
           name="婚姻状况"
           right-icon="arrow"
@@ -235,6 +253,7 @@
           v-model="userInfo.familyAnnualIncome"
           label="家庭年收入（万元）"
           name="家庭年收入"
+          required
           placeholder="请输入"
           v-validate="'required|onlyNumber'"
           clearable
@@ -245,17 +264,18 @@
           readonly
           label="家庭地址"
           name="家庭地址"
+          required
           right-icon="arrow"
           placeholder="请选择"
           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.homeZip" required 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>
diff --git a/src/views/ebiz/sale/InsuredPerson.vue b/src/views/ebiz/sale/InsuredPerson.vue
index ea81b6e8f..a59d2bb90 100644
--- a/src/views/ebiz/sale/InsuredPerson.vue
+++ b/src/views/ebiz/sale/InsuredPerson.vue
@@ -6,6 +6,7 @@
       <van-field
         :value="userInfo.relationToAppnt | idToText('relationToAppnt')"
         readonly
+        required
         label="是投保人的"
         name="是投保人的"
         right-icon="arrow"
@@ -18,6 +19,7 @@
         v-validate="'required|name'"
         name="姓名"
         label="姓名"
+        required
         :value.sync="userInfo.name"
         :parentShowPicker.sync="customerShowPicker"
         @nameChange="nameChange"
@@ -28,6 +30,7 @@
         :value="userInfo.idType | idToText('idType')"
         v-validate="'required'"
         readonly
+        required
         label="证件类型"
         name="证件类型"
         right-icon="arrow"
@@ -40,6 +43,7 @@
         maxlength="18"
         label="证件号码"
         name="证件号码"
+        required
         placeholder="请输入"
         clearable
         :readonly="isAppnt"
@@ -55,6 +59,7 @@
         name="出生日期"
         :value.sync="userInfo.birthday"
         type="date"
+        required
         :flag="true"
         @confirm="onDateConfirm($event, '2')"
         ref="birthday"
@@ -65,6 +70,7 @@
         v-validate="'required'"
         label="证件起始日期"
         name="证件起始日期"
+        required
         :defaultDate="new Date()"
         :value.sync="userInfo.certificateValidate"
         type="date"
@@ -77,6 +83,7 @@
         :v-validate="{ required: certiexpiredateRequired }"
         label="证件截止日期"
         name="证件截止日期"
+        required
         :defaultDate="new Date()"
         :value.sync="userInfo.certiexpiredate"
         type="date"
@@ -93,6 +100,7 @@
         :required="false"
         label="性别"
         name="性别"
+        required
         v-validate="'required'"
         :value.sync="userInfo.sex"
         :disabled="isAppnt"
@@ -102,18 +110,20 @@
         readonly
         label="国家/地区"
         name="国家/地区"
+        required
         v-validate="'required'"
         right-icon="arrow"
         placeholder="请选择"
         @click="toSelect('1')"
       />
-      <van-field :value="census" readonly label="户籍" name="户籍" v-validate="'required'" right-icon="arrow" placeholder="请选择" @click="areaChoose('1')" />
+      <van-field :value="census" required readonly label="户籍" name="户籍" v-validate="'required'" right-icon="arrow" placeholder="请选择" @click="areaChoose('1')" />
 
       <van-field
         v-model="userInfo.mobile"
         clearable
         label="移动电话"
         name="移动电话"
+        required
         placeholder="请输入"
         v-validate="'required|mobile'"
         maxlength="11"
@@ -134,11 +144,12 @@
           codeDisabled ? `${countDown}s后重新获取` : '发送验证码'
         }}</van-button>
       </van-field>
-      <van-field v-model="userInfo.email" label="电子邮箱" name="电子邮箱" placeholder="请输入" v-validate="'required|email'" clearable :readonly="isAppnt" />
+      <van-field v-model="userInfo.email" required label="电子邮箱" name="电子邮箱" placeholder="请输入" v-validate="'required|email'" clearable :readonly="isAppnt" />
       <van-field
         v-model="userInfo.stature"
         label="身高(cm)"
         name="身高"
+        required
         placeholder="请输入"
         v-validate="'required|onlyNumber|stature'"
         clearable
@@ -150,6 +161,7 @@
         v-model="userInfo.avoirdupois"
         label="体重(kg)"
         name="体重"
+        required
         placeholder="请输入"
         v-validate="'required|onlyNumber'"
         clearable
@@ -165,6 +177,7 @@
         readonly
         label="文化程度"
         name="文化程度"
+        required
         right-icon="arrow"
         placeholder="请选择"
         v-validate="'required'"
@@ -176,6 +189,7 @@
         label="有无社保"
         name="有无社保"
         v-validate="'required'"
+        required
         :value.sync="userInfo.medical"
         :disabled="isAppnt"
       ></select-radio>
@@ -184,6 +198,7 @@
         readonly
         label="税收居民身份"
         name="税收居民身份"
+        required
         right-icon="arrow"
         placeholder="请选择"
         v-validate="'required'"
@@ -198,6 +213,7 @@
         clearable
         label="职业类别"
         name="职业类别"
+        required
         v-validate="'required'"
         placeholder="请选择"
         :parentShowPicker.sync="occupationShowPicker"
@@ -209,6 +225,7 @@
         readonly
         label="收入来源"
         name="收入来源"
+        required
         right-icon="arrow"
         placeholder="请选择"
         v-validate="'required'"
@@ -219,6 +236,7 @@
         v-model="userInfo.otherSalarySource"
         label
         name="其他来源"
+        required
         placeholder="请输入其它收入来源"
         clearable
         maxlength="30"
@@ -228,6 +246,7 @@
         label="平均年收入（万元）"
         name="平均年收入"
         placeholder="请输入"
+        required
         v-validate="'required|onlyNumber'"
         clearable
         maxlength="5"
@@ -237,6 +256,7 @@
         v-model="userInfo.liabilitiesMoney"
         name="负债金额"
         placeholder="请输入"
+        required
         v-validate="'required|onlyNumber'"
         clearable
         maxlength="5"
@@ -249,6 +269,7 @@
         readonly
         label="在职情况"
         name="在职情况"
+        required
         placeholder="请选择"
         v-validate="'required'"
         right-icon="arrow"
@@ -258,6 +279,7 @@
         v-model="userInfo.workcompany"
         label="工作单位"
         name="工作单位"
+        required
         placeholder="请输入"
         v-validate="'required'"
         maxlength="50"
@@ -269,6 +291,7 @@
         readonly
         label="单位地址"
         name="单位地址"
+        required
         right-icon="arrow"
         placeholder="请选择"
         v-validate="'required'"
@@ -289,6 +312,7 @@
         label="邮编"
         name="邮编"
         placeholder="请输入"
+        required
         v-validate="'required|zipCode'"
         maxlength="6"
         clearable
@@ -302,6 +326,7 @@
       <van-field
         :value="userInfo.marriage | idToText('marriage')"
         readonly
+        required
         label="婚姻状况"
         name="婚姻状况"
         right-icon="arrow"
@@ -313,6 +338,7 @@
         v-model="userInfo.familyAnnualIncome"
         label="家庭年收入（万元）"
         name="家庭年收入"
+        required
         placeholder="请输入"
         v-validate="'required|onlyNumber'"
         clearable
@@ -324,6 +350,7 @@
         readonly
         label="家庭地址"
         name="家庭地址"
+        required
         right-icon="arrow"
         placeholder="请选择"
         v-validate="'required'"
@@ -343,6 +370,7 @@
         v-model="userInfo.homeZip"
         label="邮编"
         name="邮编"
+        required
         placeholder="请输入"
         v-validate="'required|zipCode'"
         maxlength="6"
@@ -619,10 +647,10 @@ export default {
       })
     }
   },
-  // mounted() {
-  //   window.appCallBack = this.appCallBack
+  mounted() {
+    window.appCallBack = this.appCallBack
   //   // document.body.style.backgroundColor = '#F5F5F5'
-  // },
+  },
   methods: {
     //监听名字变化
     nameChange(name) {