受益人添加字段

src/views/ebiz/sale/AccountInformation.vue

@@ -198,7 +198,7 @@ export default {
       this.accBankProvince = province.code
       this.accBankCity = city.code
       this.isAreaListShow = false
-      this.areaStr = province.name + city.name + county.name
+      this.areaStr = `${province.name}-${city.name}-${county.name}`
     },
     closePop() {
       //关闭选择银行弹窗

src/views/ebiz/sale/AddBeneficiaryInfo.vue

@@ -93,8 +93,18 @@
       <div class="border-bt relative fs14 p10 flex align-center">
         <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 label="性别" :value.sync="userInfo.sex" :disabled="isInsured"></select-radio>
+      <van-field
+        :value="userInfo.marriageStatus"
+        readonly
+        required
+        label="婚姻状况"
+        name="婚姻状况"
+        v-validate="'required'"
+        right-icon="arrow"
+        placeholder="请选择"
+        @click="setMarriageStatus('10')"
+      />
       <van-field
         :value="userInfo.nativeplace | idToText('nativeplace')"
         readonly
@@ -106,6 +116,29 @@
         placeholder="请选择"
         @click="toSelect('1')"
       />
+      <van-field
+        v-model="areaStr"
+        label="联系地址"
+        placeholder="请选择"
+        required
+        @click="isAreaListShow = true"
+        readonly
+        right-icon="arrow"
+        v-validate="'required'"
+        data-vv-name="联系地址"
+      />
+      <van-field v-model="userInfo.street" label="" name="详细地址" placeholder="请输入详细地址" v-validate="'required'" clearable maxlength="30" />
+      <van-field
+        v-model="userInfo.yearSalary"
+        label="平均年收入（万元）"
+        name="平均年收入"
+        required
+        placeholder="请输入，单位万元"
+        v-validate="'required|onlyNumber'"
+        data-vv-name="平均年收入"
+        clearable
+        maxlength="5"
+      />
       <!-- <van-field
         v-model="userInfo.mobile"
         clearable
@@ -128,22 +161,12 @@
         v-validate="'required'"
         @click="chooseArea"
       /> -->
-      <!-- <van-field
-        v-model="userInfo.village"
-        label=""
-        name="详细地址"
-        placeholder="请输入详细地址"
-        v-validate="'required'"
-        clearable
-        maxlength="30"
-        :readonly="isInsured"
-      /> -->
       <!-- <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" required label="电子邮箱" name="电子邮箱" placeholder="请输入" v-validate="'required|email'" clearable :readonly="isInsured" /> -->
-      <!-- <occupation-picker
-        :value.sync="userInfo.occupationCode"
+      <occupation-picker
+        :value.sync="userInfo.jobCode"
         :chooseName.sync="userInfo.occupationName"
         :lifeGrade.sync="userInfo.lifeGrade"
         :healthGrade.sync="userInfo.healthGrade"
@@ -156,7 +179,7 @@
         :parentShowPicker.sync="occupationShowPicker"
         @on-click="selectClick('2')"
         @on-choose="chooseOccupation"
-      /> -->
+      />
       <van-field
         v-model="userInfo.bnfOrder"
         required
@@ -191,9 +214,12 @@
       <van-picker show-toolbar :columns="columns" @confirm="onConfirm" @cancel="popupShow = false" />
     </van-popup>
     <!-- 地区选择 -->
-    <!-- <van-popup v-model="areaShow" position="bottom">
-      <van-area :area-list="areaList" :value="areaValue" @confirm="sureArea($event, '1')" @cancel="areaShow = false" />
-    </van-popup> -->
+    <van-popup position="bottom" v-model="isAreaListShow">
+      <van-area title="省市区" :visible-item-count="4" :area-list="areaList" @confirm="setBankArea" @cancel="isAreaListShow = false" />
+    </van-popup>
+    <van-popup v-model="isMarriageStatusShow" position="bottom">
+      <van-picker show-toolbar :columns="columns" @confirm="onMarriageConfirm" @cancel="isMarriageStatusShow = false" />
+    </van-popup>
   </div>
 </template>
 
@@ -204,16 +230,13 @@ import FieldDatePicter from '@/components/ebiz/FieldDatePicter'
 import OccupationPicker from '@/components/ebiz/occipation/OccupationPicker'
 import DataDictionary from '@/assets/js/utils/data-dictionary'
 import areaList from '@/assets/js/utils/area'
-import { getOrderDetail } from '@/api/ebiz/sale/sale'
 import filter from '@/filters/index'
-import getAreaName from '@/assets/js/utils/get-area-name'
 import utilsAge from '@/assets/js/utils/age'
 import IdentityCardScan from '@/components/ebiz/sale/IdentityCardScan'
 import CustomerPicker from '@/components/ebiz/customer/CustomerPicker'
 import idNoCheck from '@/assets/js/utils/idNoCheck'
 import { idToData } from './js/verification'
 import { selectComp } from './js/methods'
-// let relationToInsured = [{ id: 2, text: '配偶' }, { id: 3, text: '父母' }, { id: 4, text: '子女' }, { id: 5, text: '其他' }]
 let relationToInsured = [
   { id: 2, text: '配偶' },
   { id: 3, text: '父母' },
@@ -237,6 +260,12 @@ export default {
   },
   data() {
     return {
+      isAreaListShow: false,
+      province: '',
+      city: '',
+      county: '',
+      areaStr: '',
+      isMarriageStatusShow: false,
       effectiveDateTypeAble: true, //长期按钮是否禁用
       isScan: false, //是否显示证件扫描组件
       sexRadio: [
@@ -267,6 +296,15 @@ export default {
       marriage: '',
       isRequired: '', //长期前是否有*
       userInfo: {
+        yearSalary: '',
+        maritalStatus: '',
+        averageAnnualIncome: '',
+        marriageStatus: '',
+        provinceCode: '',
+        cityCode: '',
+        countyCode: '',
+        jobCode: '',
+        street: '',
         name: '',
         sex: '0',
         nativeplace: '1', //国家地区
@@ -288,7 +326,7 @@ export default {
         healthGrade: '',
         bnfType: '0' //身故受益人
       },
-      areaList: areaList,
+      areaList,
       occupationShowPicker: false,
       customerShowPicker: false, //客户列表展示
       isInsured: false, //是投保人本人,
@@ -306,6 +344,32 @@ export default {
     }
   },
   methods: {
+    setBankArea(areaInfo) {
+      let province = areaInfo[0]
+      let city = areaInfo[1]
+      let county = areaInfo[2]
+      this.userInfo.provinceCode = province.code
+      this.userInfo.cityCode = city.code
+      this.userInfo.countyCode = county.code
+      this.isAreaListShow = false
+      this.areaStr = `${province.name}-${city.name}-${county.name}`
+    },
+    onMarriageConfirm(value) {
+      this.userInfo.marriageStatus = value.text
+      if (value.text === '已婚') {
+        this.userInfo.maritalStatus = '0'
+      } else {
+        this.userInfo.maritalStatus = '1'
+      }
+      this.isMarriageStatusShow = false
+    },
+    setMarriageStatus() {
+      this.isMarriageStatusShow = true
+      this.columns = [
+        { id: 0, text: '已婚' },
+        { id: 1, text: '单身' }
+      ]
+    },
     //监听名字变化
     nameChange(name) {
       this.userInfo.name = name
@@ -397,13 +461,11 @@ export default {
     },
     //确认选择字段
     onConfirm(value) {
-      // console.log(value,this.pickerType)
       this.popupShow = false
       if (this.pickerType == '1') {
         ;[this.userInfo.nativeplace, this.nativeplace] = [value.id, value.text]
       } else if (this.pickerType == '2') {
         this.idLimit = false
-        // this.userInfo.idNo = this.userInfo.certificateValidate = this.userInfo.certiexpiredate = this.userInfo.birthday = ''
         this.userInfo.idNo = this.userInfo.certiexpiredate = this.userInfo.birthday = ''
         this.userInfo.sex = '0'
         this.effectiveDateTypeAble = false
@@ -574,9 +636,7 @@ export default {
           hiddenRight: '1'
         }
       })
-      // let { customerName, customerSex } = data
       this.userInfo.name = data.customerName //用户名
-      //this.userInfo.sex = String(data.customerSex) //性别
       if (data.dacustomerSex == null) {
         this.userInfo.sex = ''
       } else {
@@ -586,9 +646,6 @@ export default {
       this.userInfo.birthday = data.birthday //出生日期
       this.userInfo.idType = data.customerIdType //证件类型
       this.userInfo.idNo = data.customerIdNumber //证件号码
-      // this.userInfo.certificateValidate = data.idEffectStartDate //证件起始日期
-      // this.userInfo.certiexpiredate = data.idEffectEndDate //证件截止日期
-      // this.userInfo.effectiveDateType = data.idEffectEndDate == '9999-01-01' //是否长期
       if (data.idEffectEndDate == '9999-01-01') {
         this.userInfo.effectiveDateType = true //是否长期
       } else {