From 2b439a2660a08fac06203b844bb71e56e462045c Mon Sep 17 00:00:00 2001
From: "ding.zhou" <ding.zhou@ebiz-fooge.com>
Date: Tue, 25 Feb 2020 19:26:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=EF=BC=9AGFRS-221=20=E5=85=A5?=
 =?UTF-8?q?=E5=8F=B8=E5=AE=A1=E6=89=B9=20=E5=8F=98=E6=9B=B4=EF=BC=9A?=
 =?UTF-8?q?=E4=BB=A3=E7=90=86=E4=BA=BA=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/utils/data-dictionary.js        |  4 +-
 src/assets/js/utils/jump.js                   |  2 +-
 .../agentEenter/AgentEenterBasicFamily.vue    | 40 +++++++++++--------
 .../agentEenter/AgentEenterBasicInfor.vue     | 27 +++++++++++--
 .../ebiz/agentEenter/AgentEnterGuarantor.vue  | 28 +++++++++----
 src/views/ebiz/agentEenter/SeeCause.vue       | 26 +++++++++++-
 .../ebiz/agentEenter/share/ShareInfo.vue      | 24 ++++++-----
 src/views/ebiz/proposal/Exhibition.vue        |  3 +-
 src/views/ebiz/sale/AddBeneficiaryInfo.vue    | 12 +++---
 src/views/ebiz/sale/PayMent.vue               |  9 +++--
 src/views/ebiz/serve/Detail.vue               |  4 +-
 11 files changed, 126 insertions(+), 53 deletions(-)

diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js
index 7785a8fce..9fe7f3dfa 100644
--- a/src/assets/js/utils/data-dictionary.js
+++ b/src/assets/js/utils/data-dictionary.js
@@ -908,10 +908,10 @@ export default {
       code: 'GFRS_M0016'
     },
     {
-      shortName: '寿险',
+      shortName: '万能险',
       name: '国富人寿鑫管家终身寿险（万能型）',
       code: 'GFRS_M0017'
-    }
+    },
   ],
   // 职级
   applGrade: [
diff --git a/src/assets/js/utils/jump.js b/src/assets/js/utils/jump.js
index da684c08a..fc818fc31 100644
--- a/src/assets/js/utils/jump.js
+++ b/src/assets/js/utils/jump.js
@@ -2,7 +2,7 @@
 export default function jump(options) {
   // eslint-disable
   if (window.WebViewJavascriptBridge && options.flag) {
-    if (options.flag == 'h5') {
+    if (options.flag == 'h5' || options.flag == 'service') {
       EWebBridge.webCallAppInJs('bridge', {
         flag: options.flag,
         extra: options.extra
diff --git a/src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue b/src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue
index 199f60b3b..0faa47357 100644
--- a/src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue
+++ b/src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue
@@ -66,7 +66,7 @@
       <div class="add-btn mt20 pb20 text-center p15 c-gray-base" @click="add">+ 新增</div>
       <!-- end -->
       <div class="flex justify-content-s bottom-btn  bg-white">
-        <van-button class=" bottom0 left0" square plain type="danger" @click="goBack" size="large">上一步</van-button>
+        <van-button class=" bottom0 left0" square plain type="danger" v-no-more-click="1000" @click="goBack" size="large">上一步</van-button>
         <van-button class=" bottom0 left0" square type="danger" size="large" @click="nextStep" v-no-more-click="1000">下一步</van-button>
       </div>
     </van-cell-group>
@@ -77,12 +77,13 @@
   </div>
 </template>
 <script>
-import { Field, CellGroup, Button, col, popup, picker } from 'vant'
+import { Field, CellGroup, Button, col, popup, picker, Dialog } from 'vant'
 import SelectRadio from '@/components/ebiz/SelectRadio'
 import FieldDatePicter from '@/components/ebiz/FieldDatePicter'
 import DataDictionary from '@/assets/js/utils/data-dictionary'
 import RsTop from '@/components/ebiz/agentEenter/RsTop'
 import idNoCheck from '@/assets/js/utils/idNoCheck'
+import beforeDate from '@/assets/js/utils/getBeforeDate.js'
 import { saveOrUpdateInfo, agentAll } from '@/api/ebiz/agentEenter/agentEenter'
 export default {
   name: 'AgentEenterBasicFamily',
@@ -131,12 +132,17 @@ export default {
       gatPass: true,
       twPass: true,
       gtFlag1: true,
-      gtFlag2: true
+      gtFlag2: true,
+      currentTime: beforeDate.getBeforeDays(1)
     }
   },
   mounted() {
+    Dialog.alert({
+      message: '请如实填写下列各项内容，直系亲属为本人父母、子女或配偶，其余亲属不属于直系亲属。如有不实，后果自负。'
+    }).then(() => {
+      this.agentAll()
+    })
     document.body.style.backgroundColor = '#fff'
-    this.agentAll()
   },
   beforeRouteLeave(to, from, next) {
     document.body.style.backgroundColor = ''
@@ -174,18 +180,20 @@ export default {
       }
       agentAll(data).then(res => {
         if (res.result == '0') {
-          let result = res.content.ebizRelationDtoLst
-          if (result) {
-            result.map(item => {
-              delete item.id
-              delete item.baseId
-              delete item.createdDate
-              delete item.createdUser
-              delete item.isDelete
-              delete item.modifiedDate
-              delete item.modifiedUser
-            })
-            that.userInfo = result
+          if (res.content.ebizRelationDtoLst.length != 0) {
+            let result = res.content.ebizRelationDtoLst
+            if (result) {
+              result.map(item => {
+                delete item.id
+                delete item.baseId
+                delete item.createdDate
+                delete item.createdUser
+                delete item.isDelete
+                delete item.modifiedDate
+                delete item.modifiedUser
+              })
+              that.userInfo = result
+            }
           }
         }
       })
diff --git a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
index 482008d19..ddb841d4c 100644
--- a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
+++ b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
@@ -51,6 +51,7 @@
         right-icon="arrow"
         placeholder="请选择"
         @click="toSelect('10')"
+        maxlength="20"
         required
       />
       <!-- <van-field v-model="userInfo.title" label="职称" name="职称" v-validate="'required'" placeholder="请输入" required /> -->
@@ -127,7 +128,16 @@
 
       <van-field v-model="userInfo.bankAddress" label="开户地" name="开户地" placeholder="请输入" v-validate="'required'" required clearable />
       <van-field v-model="userInfo.accountName" label="开户姓名" name="开户姓名" placeholder="请输入" v-validate="'required'" required clearable />
-      <van-field v-model="userInfo.bankCode" maxlength="19" label="银行卡号" name="银行卡号" placeholder="请输入" required clearable v-validate="'required'">
+      <van-field
+        v-model="userInfo.bankCode"
+        maxlength="19"
+        label="银行卡号"
+        name="银行卡号"
+        placeholder="请输入"
+        required
+        clearable
+        v-validate="'required|bankCard'"
+      >
         <van-button slot="button" size="small" type="danger" round @click="cardScanning('0')">银行卡扫描</van-button>
       </van-field>
       <van-field
@@ -354,7 +364,7 @@ export default {
         degree: '', //学历
         school: '', // 学校
         discipline: '', // 专业
-        homePhone: '', //家庭电话
+        // homePhone: '', //家庭电话
         idType: '1', //证件类型
         idNo: '', //证件号码
         dateStart: '', //证件起始日期
@@ -398,7 +408,7 @@ export default {
   mounted() {
     // 筛选按钮的点击事件
     // window.appCallBack = this.appCallBack
-    window.appCallBack = appCallBack
+    window.appCallBack = this.appCallBack
     this.agentAll()
     // // 获取银行卡
     // this.getBankList()
@@ -535,6 +545,7 @@ export default {
           saveOrUpdateInfo(data).then(res => {
             if (res.result == '0') {
               this.$toast.clear()
+              localStorage.agentSex = this.userInfo.sex
               this.$jump({
                 flag: 'h5',
                 extra: {
@@ -638,12 +649,20 @@ export default {
       this.$jump({
         flag: 'navigation',
         extra: {
-          title: '账户信息',
+          title: '入司基本信息',
           hiddenRight: '1'
         }
       })
       this.isScan = false
     }
+    // //验证宅电
+    // HomeMobile(value) {
+    //   let res = /^((0\d{2,3}-\d{7,8})|(1\d{10}))$/.test(value)
+    //   if (value != '' && !res) {
+    //     this.userInfo.homePhone = ''
+    //     return this.$toast('宅电输入有误')
+    //   }
+    // }
   },
   beforeDestroy() {
     //清理计时器
diff --git a/src/views/ebiz/agentEenter/AgentEnterGuarantor.vue b/src/views/ebiz/agentEenter/AgentEnterGuarantor.vue
index 35e1ccda4..94eec68c2 100644
--- a/src/views/ebiz/agentEenter/AgentEnterGuarantor.vue
+++ b/src/views/ebiz/agentEenter/AgentEnterGuarantor.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="insured-info-container pb50">
+  <div class="guarant-info-container pb50">
     <!-- 基本信息 -->
     <van-cell-group>
       <RsTop :active="['1', '2']"></RsTop>
@@ -55,7 +55,7 @@
       <!-- end -->
       <div class="flex justify-content-s bottom-btn  bg-white">
         <van-button class=" bottom0 left0" square plain type="danger" @click="goBack" size="large">上一步</van-button>
-        <van-button class=" bottom0 left0" square type="danger" size="large" @click="nextStep" v-no-more-click="1000">下一步</van-button>
+        <van-button class=" bottom0 left0" square type="danger" size="large" @click.native="nextStep" v-no-more-click="1000">下一步</van-button>
       </div>
     </van-cell-group>
     <!-- 字段选择 -->
@@ -65,7 +65,7 @@
   </div>
 </template>
 <script>
-import { Field, CellGroup, Button, col, popup, picker } from 'vant'
+import { Field, CellGroup, Button, col, popup, picker, Dialog } from 'vant'
 import FieldDatePicter from '@/components/ebiz/FieldDatePicter'
 import SelectRadio from '@/components/ebiz/SelectRadio'
 import DataDictionary from '@/assets/js/utils/data-dictionary'
@@ -95,7 +95,7 @@ export default {
         relation: '',
         type: '',
         name: '',
-        sex: '',
+        sex: '0',
         idNo: '',
         company: '',
         homeAdress: '',
@@ -114,8 +114,12 @@ export default {
     }
   },
   mounted() {
+    Dialog.alert({
+      message: '请如实填写下列各项内容，担保人为年满18岁的中国公民。如有不实，后果自负。'
+    }).then(() => {
+      this.agentAll()
+    })
     document.body.style.backgroundColor = '#fff'
-    this.agentAll()
   },
   beforeRouteLeave(to, from, next) {
     document.body.style.backgroundColor = ''
@@ -150,7 +154,15 @@ export default {
       })
       agentAll(data).then(res => {
         that.$toast.clear()
-        that.userInfo = res.content.ebizGuarantorDto
+        if (res.content.ebizGuarantorDto.length != 0) {
+          that.userInfo = res.content.ebizGuarantorDto
+          //性别返显
+          if (res.content.ebizGuarantorDto.sex == null) {
+            this.userInfo.sex = '0'
+          } else {
+            this.userInfo.sex = String(res.content.ebizGuarantorDto.sex) //性别
+          }
+        }
       })
     },
     toSelect(pickerType, index, valueKey) {
@@ -195,6 +207,8 @@ export default {
             }
           }
           this.save()
+        } else {
+          this.$toast(this.$validator.errors.all()[0])
         }
       })
     },
@@ -233,7 +247,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.insured-info-container {
+.guarant-info-container {
   .referrerW {
     /deep/.van-cell__title {
       width: 110px;
diff --git a/src/views/ebiz/agentEenter/SeeCause.vue b/src/views/ebiz/agentEenter/SeeCause.vue
index 2f291032b..7bdb93add 100644
--- a/src/views/ebiz/agentEenter/SeeCause.vue
+++ b/src/views/ebiz/agentEenter/SeeCause.vue
@@ -23,10 +23,11 @@
 
 <script>
 import { Field, Icon, Button, Checkbox, CheckboxGroup } from 'vant'
+import { processCheck } from '@/api/ebiz/agentEenter/agentEenter'
 export default {
   data() {
     return {
-      srcSuccess: this.$assetsUrl + 'images/success.png',
+      // srcSuccess: this.$assetsUrl + 'images/fail.png',
       pdfUrl: '',
       checked: false,
       refusalCause: '', //审批拒绝原因
@@ -50,12 +51,33 @@ export default {
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + `/#/agentEenter/AgentEenterBasicInfor`
+          url: location.origin + `/#/agentEenter/AgentEenterBasicInfor`,
+          forbidSwipeBack: '1'
         },
         routerInfo: {
           path: `/agentEenter/AgentEenterBasicInfor`
         }
       })
+    },
+    processCheck() {
+      let that = this
+      that.$toast.loading({
+        duration: 0, // 持续展示 toast
+        forbidClick: true, // 禁用背景点击
+        loadingType: 'spinner',
+        message: '加载中……'
+      })
+      let data = {}
+      processCheck(data).then(res => {
+        // console.log(res)
+        // console.log('res.result', res.result)
+        if (res.result == '0') {
+          that.$toast.clear()
+          that.proces = res.content
+        } else {
+          this.$toast(res.resultMessage)
+        }
+      })
     }
   },
   components: {
diff --git a/src/views/ebiz/agentEenter/share/ShareInfo.vue b/src/views/ebiz/agentEenter/share/ShareInfo.vue
index acae76656..e351b4583 100644
--- a/src/views/ebiz/agentEenter/share/ShareInfo.vue
+++ b/src/views/ebiz/agentEenter/share/ShareInfo.vue
@@ -4,7 +4,8 @@
     <van-cell-group class="mt10">
       <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">推荐人信息</p>
       <van-field v-model="recommender.name" label="推荐人姓名" name="推荐人姓名" readonly />
-      <van-field :value="recommender.agentGrade" label="推荐人职级" name="推荐人职级" readonly />
+      <van-field :value="getAgentGrade(recommender.agentGrade)" label="推荐人职级" name="推荐人职级" readonly />
+      <!-- <van-field v-model="recommender.applyNo" label="推荐人工号" name="推荐人工号" readonly /> -->
       <van-field v-model="recommender.unitName" label="销售机构" name="销售机构" readonly />
       <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">个人信息</p>
       <van-field v-model="userInfo.name" label="姓名" name="姓名" placeholder="请输入" v-validate="'required|name'" clearable />
@@ -105,7 +106,8 @@ export default {
       recommender: {
         name: '--',
         agentGrade: '--',
-        unitName: '--'
+        unitName: '--',
+        applyNo: '--'
       },
       agentGrade: '',
       userInfo: {
@@ -176,13 +178,6 @@ export default {
             console.log('response.data.content', response.data.content)
             if (response.data.content.result == '0') {
               self.recommender = response.data.content
-              DataDictionary.agentGrade.map((item, index) => {
-                for (var key in item) {
-                  if (key == response.data.content.agentGrade) {
-                    self.recommender.agentGrade = item[response.data.content.agentGrade]
-                  }
-                }
-              })
             } else {
               this.$toast.fail(response.data.content.resultMessage)
             }
@@ -211,6 +206,17 @@ export default {
       //     console.log(err)
       //   })
     },
+    getAgentGrade(agentGrade) {
+      let result = ''
+      DataDictionary.agentGrade.map((item, index) => {
+        for (var key in item) {
+          if (key == agentGrade) {
+            result = item[agentGrade]
+          }
+        }
+      })
+      return result
+    },
     // 下一步
     nextStep() {
       var self = this
diff --git a/src/views/ebiz/proposal/Exhibition.vue b/src/views/ebiz/proposal/Exhibition.vue
index efbc40bdd..30c254111 100644
--- a/src/views/ebiz/proposal/Exhibition.vue
+++ b/src/views/ebiz/proposal/Exhibition.vue
@@ -176,7 +176,7 @@
       <van-button class="ml10 mr20 fs17 h40 lh40" size="large" plain type="danger" @click="goPDF">生成PDF</van-button>
     </div>
     <div class="pt40 text-justify bg-white pr15 pl15 c-gray-base fs13 pb60">
-      【温馨提示】本资料仅供客户理解产品条款所用，有关产品的说明、解释、承若、或保证，如与产品条款不一致，均以产品条款为准。
+      【温馨提示】本资料仅供客户理解产品条款所用，有关产品的说明、解释、承诺、或保证，如与产品条款不一致，均以产品条款为准。
     </div>
     <div v-if="!isWeixin" class="bottom-btn fs16">
       <van-button type="danger" @click="insure" size="large">转投保</van-button>
@@ -282,6 +282,7 @@ export default {
         }
       } else {
         //在app端
+        
         params.proposalInfoDTO.proposalNo = localStorage.orderNo
         this.mainRiskCodes.push(localStorage.mainRiskCode)
         console.log(localStorage.mainRiskCode)
diff --git a/src/views/ebiz/sale/AddBeneficiaryInfo.vue b/src/views/ebiz/sale/AddBeneficiaryInfo.vue
index bc4f534f0..920e18118 100644
--- a/src/views/ebiz/sale/AddBeneficiaryInfo.vue
+++ b/src/views/ebiz/sale/AddBeneficiaryInfo.vue
@@ -634,8 +634,8 @@ export default {
       this.userInfo.occupationName = data.occupationName //职业类别名称
       this.userInfo.lifeGrade = data.lifeGrade //寿险等级
       this.userInfo.healthGrade = data.healthGrade //健康等级
-      this.userInfo.mobile = data.customerPhone //移动电话
-      this.userInfo.email = data.email //电子邮箱
+      // this.userInfo.mobile = data.customerPhone //移动电话
+      // this.userInfo.email = data.email //电子邮箱
       // this.userInfo.province = data.homeProvince //家庭省
       // this.userInfo.city = data.homeCity //家庭市
       // this.userInfo.area = data.homeArea //家庭区
@@ -936,8 +936,8 @@ export default {
         this.idLimit = true
         this.userInfo.occupationCode = insuredDetail.occupationCode //职业类别编码
         this.userInfo.occupationName = insuredDetail.occupationName //职业类别名称
-        this.userInfo.mobile = insuredDetail.mobile //联系电话
-        this.userInfo.email = insuredDetail.email //电子邮箱
+        // this.userInfo.mobile = insuredDetail.mobile //联系电话
+        // this.userInfo.email = insuredDetail.email //电子邮箱
       } else {
         this.isInsured = false
         this.userInfo.relationToInsured = ''
@@ -955,8 +955,8 @@ export default {
         this.idLimit = false
         this.userInfo.occupationCode = '' //职业类别编码
         this.userInfo.occupationName = '' //职业类别名称
-        this.userInfo.mobile = '' //联系电话
-        this.userInfo.email = '' //电子邮箱
+        // this.userInfo.mobile = '' //联系电话
+        // this.userInfo.email = '' //电子邮箱
       }
     },
     //长期状态改变时
diff --git a/src/views/ebiz/sale/PayMent.vue b/src/views/ebiz/sale/PayMent.vue
index 1e43281c0..d8eb1fd36 100644
--- a/src/views/ebiz/sale/PayMent.vue
+++ b/src/views/ebiz/sale/PayMent.vue
@@ -151,9 +151,10 @@ export default {
     document.body.style.backgroundColor = '#fff'
     if (localStorage.salelist == '1') {
       // 第一次支付 调核保获取
-      this.underWrite()
-      this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
-      this.srcImg = this.$assetsUrl + `images/bank/bank_${JSON.parse(window.localStorage.getItem('underWriteData')).bankCode}.png`
+      this.underWrite().then(() => {
+        this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
+        this.srcImg = this.$assetsUrl + `images/bank/bank_${JSON.parse(window.localStorage.getItem('underWriteData')).bankCode}.png`
+      })
     } else {
       // 再次支付 调详情 获取信息
       this.twounderWrite()
@@ -286,7 +287,7 @@ export default {
         }
       }
 
-      underWrite(data).then(res => {
+      return underWrite(data).then(res => {
         if (res.result == '0') {
           this.$toast.clear()
           if (res.uwResult == '02') {
diff --git a/src/views/ebiz/serve/Detail.vue b/src/views/ebiz/serve/Detail.vue
index 5117b5d98..b0ac88151 100644
--- a/src/views/ebiz/serve/Detail.vue
+++ b/src/views/ebiz/serve/Detail.vue
@@ -57,7 +57,9 @@
               <van-cell title="险种名称" :value="it.riskName" />
               <van-cell title="保险期间" :value="it.insuYear" />
 
-              <van-cell title="交费期间" :value="Number(it.years) > 30 ? '至70周岁' : `${it.years}年交`" />
+              <!-- <van-cell title="交费期间" :value="Number(it.years) > 30 ? '至70周岁' : `${it.years}年交`" /> -->
+              <van-cell title="交费期间" :value="it.payIntv" />
+                
               <van-cell title="险种保额(元)" :value="it.amt | moneyFormat" />
               <van-cell title="险种保费(元)" :value="it.mainPremDetail | moneyFormat" />
               <van-collapse-item title="附加险信息" :name="num + 61" v-for="(i, num) in it.addtion" :key="num">