From b4c69e36ebba8acb834042ec2c23c42329811a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Thu, 21 Nov 2019 10:57:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/utils/data-dictionary.js        | 394 ++++++++++++++----
 src/views/ebiz/proposal/Exhibition.vue        |   8 +
 src/views/ebiz/sale/InsuredInfo.vue           |   2 +-
 src/views/ebiz/sale/SignatureConfirmation.vue |   6 +-
 4 files changed, 335 insertions(+), 75 deletions(-)

diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js
index a7997fe6d..13714bfea 100644
--- a/src/assets/js/utils/data-dictionary.js
+++ b/src/assets/js/utils/data-dictionary.js
@@ -684,12 +684,52 @@ export default {
     {
       shortName: '重疾险',
       name: '国富人寿八桂无忧重大疾病保险（B款）',
-      code: 'GFRSPRO_M0001'
+      code: 'GFRS_M0001'
     },
     {
       shortName: '年金险',
       name: '国富人寿国富民鑫年金保险',
-      code: 'GFRSPRO_M0002'
+      code: 'GFRS_M0002'
+    },
+    {
+      shortName: '年金险',
+      name: '国富人寿金管家养老年金保险产品（万能型）',
+      code: 'GFRS_M0003'
+    },
+    {
+      shortName: '年金险',
+      name: '国富人寿瑞利年金保险',
+      code: 'GFRS_M0004'
+    },
+    {
+      shortName: '医疗险',
+      name: '国富人寿国富民惠医疗保险',
+      code: 'GFRS_M0005'
+    },
+    {
+      shortName: '年金险',
+      name: '国富人寿福宝宝教育年金保险',
+      code: 'GFRS_M0006'
+    },
+    {
+      shortName: '重疾险',
+      name: '国富人寿国富民安重大疾病保险',
+      code: 'GFRS_M0007'
+    },
+    {
+      shortName: '意外险',
+      name: '国富人寿综合意外伤害保险',
+      code: 'GFRS_M0008'
+    },
+    {
+      shortName: '重疾险',
+      name: '国富人寿国富民康重大疾病保险',
+      code: 'GFRS_M0009'
+    },
+    {
+      shortName: '重疾险',
+      name: '国富人寿八桂无忧重大疾病保险',
+      code: 'GFRS_M0010'
     }
   ],
   // 收入来源
@@ -745,79 +785,289 @@ export default {
   ],
   // 民族
   nationType: [
-    { id: '01', text: '汉族' },
-    { id: '02', text: '蒙古族' },
-    { id: '03', text: '回族' },
-    { id: '04', text: '藏族' },
-    { id: '05', text: '维吾尔族' },
-    { id: '06', text: '苗族' },
-    { id: '07', text: '彝族' },
-    { id: '08', text: '壮族' },
-    { id: '09', text: '布依族' },
-    { id: '10', text: '朝鲜族' },
-    { id: '11', text: '满族' },
-    { id: '12', text: '侗族' },
-    { id: '13', text: '瑶族' },
-    { id: '14', text: '白族' },
-    { id: '15', text: '土家族' },
-    { id: '16', text: '哈尼族' },
-    { id: '17', text: '哈萨克族' },
-    { id: '18', text: '傣族' },
-    { id: '19', text: '黎族' },
-    { id: '20', text: '傈僳族' },
-    { id: '21', text: '佤族' },
-    { id: '22', text: '畲族' },
-    { id: '23', text: '高山族' },
-    { id: '24', text: '拉祜族' },
-    { id: '25', text: '水族' },
-    { id: '26', text: '东乡族' },
-    { id: '27', text: '纳西族' },
-    { id: '28', text: '景颇族' },
-    { id: '代码', text: '民族' },
-    { id: '29', text: '柯尔克孜族' },
-    { id: '30', text: '土族' },
-    { id: '31', text: '达斡尔族' },
-    { id: '32', text: '仫佬族' },
-    { id: '33', text: '羌族' },
-    { id: '34', text: '布朗族' },
-    { id: '35', text: '撒拉族' },
-    { id: '36', text: '毛难族' },
-    { id: '37', text: '仡佬族' },
-    { id: '38', text: '锡伯族' },
-    { id: '39', text: '阿昌族' },
-    { id: '40', text: '普米族' },
-    { id: '41', text: '塔吉克族' },
-    { id: '42', text: '怒族' },
-    { id: '43', text: '乌孜别克族' },
-    { id: '44', text: '俄罗斯族' },
-    { id: '45', text: '鄂温克族' },
-    { id: '46', text: '崩龙族' },
-    { id: '47', text: '保安族' },
-    { id: '48', text: '裕固族' },
-    { id: '49', text: '京族' },
-    { id: '50', text: '塔塔尔族' },
-    { id: '51', text: '独龙族' },
-    { id: '52', text: '鄂伦春族' },
-    { id: '53', text: '赫哲族' },
-    { id: '54', text: '门巴族' },
-    { id: '55', text: '珞巴族' },
-    { id: '56', text: '基诺族' },
-    { id: '97', text: '其他' },
-    { id: '98', text: '外国血统' }
+    {
+      id: '01',
+      text: '汉族'
+    },
+    {
+      id: '02',
+      text: '蒙古族'
+    },
+    {
+      id: '03',
+      text: '回族'
+    },
+    {
+      id: '04',
+      text: '藏族'
+    },
+    {
+      id: '05',
+      text: '维吾尔族'
+    },
+    {
+      id: '06',
+      text: '苗族'
+    },
+    {
+      id: '07',
+      text: '彝族'
+    },
+    {
+      id: '08',
+      text: '壮族'
+    },
+    {
+      id: '09',
+      text: '布依族'
+    },
+    {
+      id: '10',
+      text: '朝鲜族'
+    },
+    {
+      id: '11',
+      text: '满族'
+    },
+    {
+      id: '12',
+      text: '侗族'
+    },
+    {
+      id: '13',
+      text: '瑶族'
+    },
+    {
+      id: '14',
+      text: '白族'
+    },
+    {
+      id: '15',
+      text: '土家族'
+    },
+    {
+      id: '16',
+      text: '哈尼族'
+    },
+    {
+      id: '17',
+      text: '哈萨克族'
+    },
+    {
+      id: '18',
+      text: '傣族'
+    },
+    {
+      id: '19',
+      text: '黎族'
+    },
+    {
+      id: '20',
+      text: '傈僳族'
+    },
+    {
+      id: '21',
+      text: '佤族'
+    },
+    {
+      id: '22',
+      text: '畲族'
+    },
+    {
+      id: '23',
+      text: '高山族'
+    },
+    {
+      id: '24',
+      text: '拉祜族'
+    },
+    {
+      id: '25',
+      text: '水族'
+    },
+    {
+      id: '26',
+      text: '东乡族'
+    },
+    {
+      id: '27',
+      text: '纳西族'
+    },
+    {
+      id: '28',
+      text: '景颇族'
+    },
+    {
+      id: '代码',
+      text: '民族'
+    },
+    {
+      id: '29',
+      text: '柯尔克孜族'
+    },
+    {
+      id: '30',
+      text: '土族'
+    },
+    {
+      id: '31',
+      text: '达斡尔族'
+    },
+    {
+      id: '32',
+      text: '仫佬族'
+    },
+    {
+      id: '33',
+      text: '羌族'
+    },
+    {
+      id: '34',
+      text: '布朗族'
+    },
+    {
+      id: '35',
+      text: '撒拉族'
+    },
+    {
+      id: '36',
+      text: '毛难族'
+    },
+    {
+      id: '37',
+      text: '仡佬族'
+    },
+    {
+      id: '38',
+      text: '锡伯族'
+    },
+    {
+      id: '39',
+      text: '阿昌族'
+    },
+    {
+      id: '40',
+      text: '普米族'
+    },
+    {
+      id: '41',
+      text: '塔吉克族'
+    },
+    {
+      id: '42',
+      text: '怒族'
+    },
+    {
+      id: '43',
+      text: '乌孜别克族'
+    },
+    {
+      id: '44',
+      text: '俄罗斯族'
+    },
+    {
+      id: '45',
+      text: '鄂温克族'
+    },
+    {
+      id: '46',
+      text: '崩龙族'
+    },
+    {
+      id: '47',
+      text: '保安族'
+    },
+    {
+      id: '48',
+      text: '裕固族'
+    },
+    {
+      id: '49',
+      text: '京族'
+    },
+    {
+      id: '50',
+      text: '塔塔尔族'
+    },
+    {
+      id: '51',
+      text: '独龙族'
+    },
+    {
+      id: '52',
+      text: '鄂伦春族'
+    },
+    {
+      id: '53',
+      text: '赫哲族'
+    },
+    {
+      id: '54',
+      text: '门巴族'
+    },
+    {
+      id: '55',
+      text: '珞巴族'
+    },
+    {
+      id: '56',
+      text: '基诺族'
+    },
+    {
+      id: '97',
+      text: '其他'
+    },
+    {
+      id: '98',
+      text: '外国血统'
+    }
   ],
   //政治面貌
   politicsStatus: [
-    { id: '01', text: '中共党员' },
-    { id: '02', text: '中共预备党员' },
-    { id: '04', text: '民革党员' },
-    { id: '05', text: '民盟盟员' },
-    { id: '06', text: '民建会员' },
-    { id: '07', text: '民进会员' },
-    { id: '08', text: '农工党党员' },
-    { id: '09', text: '致公党党员' },
-    { id: '10', text: '九三学社社员' },
-    { id: '11', text: '台盟盟员' },
-    { id: '12', text: '无党派人士' }
+    {
+      id: '01',
+      text: '中共党员'
+    },
+    {
+      id: '02',
+      text: '中共预备党员'
+    },
+    {
+      id: '04',
+      text: '民革党员'
+    },
+    {
+      id: '05',
+      text: '民盟盟员'
+    },
+    {
+      id: '06',
+      text: '民建会员'
+    },
+    {
+      id: '07',
+      text: '民进会员'
+    },
+    {
+      id: '08',
+      text: '农工党党员'
+    },
+    {
+      id: '09',
+      text: '致公党党员'
+    },
+    {
+      id: '10',
+      text: '九三学社社员'
+    },
+    {
+      id: '11',
+      text: '台盟盟员'
+    },
+    {
+      id: '12',
+      text: '无党派人士'
+    }
   ],
   rsIdType: [
     {
diff --git a/src/views/ebiz/proposal/Exhibition.vue b/src/views/ebiz/proposal/Exhibition.vue
index b2c0f7290..472a96110 100644
--- a/src/views/ebiz/proposal/Exhibition.vue
+++ b/src/views/ebiz/proposal/Exhibition.vue
@@ -253,6 +253,7 @@ export default {
         //在app端
         params.proposalInfoDTO.proposalNo = localStorage.orderNo
         getDemo(params).then(res => {
+         
           this.formatLocal(res)
         })
       }
@@ -332,9 +333,16 @@ export default {
     },
     //获取微信分享的标题
     getWXTitle(insuredDTOs) {
+      
       dataDictionary.riskType.forEach(dataRisk => {
         //根据数字字典来找到 险种简称
+        // console.log(insuredDTOs)
+        // console.log(insuredDTOs[0].mainRisk[0].riskCode)
+          // console.log(dataRisk.code)
+      
         if (insuredDTOs[0].mainRisk[0].riskCode == dataRisk.code) {
+          
+        
           this.wxTitle = dataRisk.shortName + '计划书'
         }
       })
diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue
index f79d61333..612884255 100644
--- a/src/views/ebiz/sale/InsuredInfo.vue
+++ b/src/views/ebiz/sale/InsuredInfo.vue
@@ -26,7 +26,7 @@
         @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" required label="证件号码" name="证件号码" placeholder="请输入" clearable @blur="getRelatedData(userInfo.idNo)">
+      <van-field v-model="userInfo.idNo" maxlength="18" required label="证件号码" v-validate="'required'" 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
diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue
index 258513cd1..d7bf544a2 100644
--- a/src/views/ebiz/sale/SignatureConfirmation.vue
+++ b/src/views/ebiz/sale/SignatureConfirmation.vue
@@ -298,7 +298,7 @@ export default {
           this.isInvalid = true
         }
         this.airSign = sessionStorage.getItem('airSign')
-        this.shareCode = sessionStorage.getItem('shareCode')
+        // this.shareCode = sessionStorage.getItem('shareCode')
         this.relationToAppnt = this.$route.query.relationToAppnt
         this.isShow = false
         this.getOrderDetail().then(() => {
@@ -311,9 +311,11 @@ export default {
             Dialog.alert({ title: '提示', message: '签名成功，请联系业务员进行后续流程！' })
           }
         })
-        if (this.shareCode == '1') {
+        if (sessionStorage.shareCode == '1') {
+          console.log('进来投保人')
           this.tipsName = localStorage.saleInsuredPersonInfo.name
         } else {
+          console.log('进来被保人')
           this.tipsName = localStorage.saleInsuredInfo.name
         }
         weixinShare({