From 5d13235c8f0564c4c3d5812f855e17b89001d93d Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Fri, 22 May 2020 14:26:09 +0800
Subject: [PATCH 01/14] =?UTF-8?q?[FIX]=E7=94=B5=E6=8A=95-=E6=A1=82?=
 =?UTF-8?q?=E4=BC=81-=E8=B4=A3=E4=BB=BB=E4=BF=9D=E8=B4=B9=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E4=BA=A7=E5=93=81=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/common/CalculatePremium.vue | 48 ++++++++++++++--------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index bfd497cda..b76d40715 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -49,7 +49,7 @@
               />
             </div>
           </div>
-          <div 
+          <div
             class="flex justify-content-s pv10 border-bottom"
             v-if="riskFactor.type == 0"
             :class="{ hidden: riskFactor.code == 'payEndYear' && item.isHidden }"
@@ -467,19 +467,19 @@ export default {
         //初始化数据试算
         this.getTrial()
       })
-      
+
       // 判断是否 含有 后台配置js验证函数
-      if(localStorage.ruleExpression){
-        let ruleExpression = JSON.parse(localStorage.ruleExpression);
+      if (localStorage.ruleExpression) {
+        let ruleExpression = JSON.parse(localStorage.ruleExpression)
         this.ruleExpression = ruleExpression
         let productCodes = Object.keys(ruleExpression)
         productCodes.forEach(itemKey => {
           // console.log(ruleExpression[itemKey]);
-          let rules = ruleExpression[itemKey];
-          rules.eventList = [];
-          rules.forEach( item => {
+          let rules = ruleExpression[itemKey]
+          rules.eventList = []
+          rules.forEach(item => {
             let config = ''
-            config = JSON.parse(item.ruleExpression);
+            config = JSON.parse(item.ruleExpression)
             // let errorMsg = item.errorMsg;
             // config = {
             //   eventName: 'GFRS_M0020_payEndYear_insuYear',
@@ -534,8 +534,8 @@ export default {
             //   '}'],
             //   funPar: ['par','ParKey','Par'],
             // }
-            // console.log("config",config); 
-            this.$on(config.eventName, new Function( ...config.funPar, config.funBody.join('')));
+            // console.log("config",config);
+            this.$on(config.eventName, new Function(...config.funPar, config.funBody.join('')))
             rules.eventList.push(config.eventName)
           })
         })
@@ -688,7 +688,7 @@ export default {
           return false
         }
         // console.log("productCode ==>" , productCode)
-        
+
         // if(this.ruleExpression[productCode]){
         //   this.errorMsg = []
         //   this.ruleExpression[productCode].eventList.forEach(item => {
@@ -701,28 +701,28 @@ export default {
         //   }
         // }
         let productCode = this.chooseProducts[this.productIndex].productCode
-        if(this.ruleExpression[productCode]){
+        if (this.ruleExpression[productCode]) {
           this.errorMsg = []
           let currentFactor = this.chooseProducts[this.productIndex].calFactorLst
           let currentEle = currentFactor[this.calFactorIndex]
           this.ruleExpression[productCode].eventList.forEach(item => {
-            this.$emit(item,currentFactor,currentEle.code,value);
+            this.$emit(item, currentFactor, currentEle.code, value)
           })
-          if(this.errorMsg.length > 0){
-            this.$toast(this.errorMsg[0]);
+          if (this.errorMsg.length > 0) {
+            this.$toast(this.errorMsg[0])
             this.errorMsg = []
             this.popupShow = false
             return false
           }
         }
-        
+
         // 后台配置 的 js函数 验证
         // if(hasR){
         //   if(currentEle.code == 'payEndYear' || currentEle.code == 'insuYear'){
         //      this.payEndYear(currentEle.code,value.value,this.tmpInsuYear.insuYear + this.tmpInsuYear.insuYearFlag)
         //   }
         // }
-        
+
         currentEle.showContent = value.text
         let name = currentEle.code
         currentEle[name] = value.value
@@ -1457,6 +1457,11 @@ export default {
             riskItem['dutyLst'] = this.trialList[index].duty
             //930折中方案，责任险分档
             riskItem['amt'] = this.trialList[index].amt
+          } else {
+            //国富人寿桂企保重大疾病保险产品专写
+            if (this.trialList[index].productCode == 'GFRS_M0024') {
+              riskItem['dutyLst'] = this.trialInfos[index].duty
+            }
           }
           //保费算保额
           console.log('this.trialList', this.trialList[index].trialType)
@@ -1485,7 +1490,6 @@ export default {
             this.trialInfos[index].amt = this.trialList[0].prem
           }
           // console.log(riskItem)
-          console.log(this.trialInfos[index])
           riskItem = Object.assign(riskItem, this.trialInfos[index])
           // console.log(riskItem)
           riskDTOLst.push(riskItem)
@@ -1494,6 +1498,14 @@ export default {
       if (!rollInResult) {
         return
       }
+
+      //国富人寿桂企保重大疾病保险产品专写
+      this.trialInfos.map((v, i) => {
+        if (v.productCode == 'GFRS_M0024') {
+          delete riskDTOLst[i].duty
+        }
+      })
+
       // console.log('riskDTOLst', riskDTOLst)
       //建议书需要添加全部投保人信息，电投只需要投保人ID
       let insuredDTOItem = Object.assign(this.saleInsuredPersonInfo, { riskDTOLst: riskDTOLst })

From df763197d077e5a24e943f6b1a02db5232eb89ea Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Fri, 22 May 2020 15:36:02 +0800
Subject: [PATCH 02/14] =?UTF-8?q?[FIX]=E3=80=90=E7=94=B5=E6=8A=95-?=
 =?UTF-8?q?=E6=A1=82=E4=BC=81=E3=80=91=E6=A1=82=E4=BC=81=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E2=80=94=E2=80=94GFRS=5FM0024=E2=80=94=E2=80=94=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B4=A3=E4=BB=BB=E4=BF=9D=E8=B4=B9=E5=8F=8A?=
 =?UTF-8?q?=EF=BC=88=E4=B8=87=E5=85=83=EF=BC=89=EF=BC=8C=E5=8F=AA=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=B4=A3=E4=BB=BB=E5=90=8D=E7=A7=B0=E5=8F=8A=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/common/CalculatePremium.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index b76d40715..43350d8b1 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -63,13 +63,16 @@
               @click="toSelect(index, riskFactorIndex, riskFactor.columns)"
             />
           </div>
+          <!-- 桂企产品——GFRS_M0024——不显示责任保费及（万元），只显示责任名称及勾选框 -->
           <div class="border-bottom" v-if="riskFactor.type == 3">
             <div class="pv12 border-bd">{{ riskFactor.name }}</div>
             <div class="duty">
               <div class="flex justify-content-s border-bd pv10 align-items-c" v-for="(dutyItem, dutyItemIndex) in riskFactor.rules" :key="dutyItemIndex">
-                <span class="fs14 w100">{{ dutyItem.dutyName }}({{ dutyItem.suffix }})</span>
+                <span v-if="item.productCode != 'GFRS_M0024'" class="fs14 w100">{{ dutyItem.dutyName }}({{ dutyItem.suffix }})</span>
+                <span v-else class="fs14 w100">{{ dutyItem.dutyName }}</span>
                 <div class="flex relative">
                   <van-stepper
+                    v-if="item.productCode != 'GFRS_M0024'"
                     v-model="dutyItem.defaultDutyAmt"
                     :min="dutyItem.minDutyAmt"
                     :max="dutyItem.maxDutyAmt"

From c73ba17fc1365e1dc3eb77122f6971d3aafe7327 Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Sat, 23 May 2020 15:24:33 +0800
Subject: [PATCH 03/14] =?UTF-8?q?[NEW]=E3=80=90=E7=94=B5=E6=8A=95-?=
 =?UTF-8?q?=E6=A1=82=E4=BC=81=E3=80=91=E5=A2=9E=E5=8A=A0=E6=8A=95=E4=BF=9D?=
 =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E5=B7=A5=E4=BD=9C=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A1=86=EF=BC=9B=E5=A2=9E=E5=8A=A0=E4=BB=A3?=
 =?UTF-8?q?=E7=90=86=E4=BA=BA=E5=94=AE=E5=8D=96=E6=9D=83=E9=99=90=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=EF=BC=9B=E5=A2=9E=E5=8A=A0=E6=8A=95=E4=BF=9D=E4=BA=BA?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8D=95=E4=BD=8D=E6=8A=95=E4=BF=9D=E8=B5=84?=
 =?UTF-8?q?=E6=A0=BC=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ebiz/common/common.js            |   9 ++
 src/api/ebiz/sale/sale.js                |   8 ++
 src/assets/js/business-common.js         |   1 +
 src/views/ebiz/common/MainRiskList.vue   |  23 ++++-
 src/views/ebiz/common/risk-rules.js      |  59 ++++++++++-
 src/views/ebiz/product/ProductDetail.vue |  15 ++-
 src/views/ebiz/proposal/ProposalInfo.vue |  18 +++-
 src/views/ebiz/sale/InsuredInfo.vue      | 119 ++++++++++++++++++-----
 8 files changed, 211 insertions(+), 41 deletions(-)

diff --git a/src/api/ebiz/common/common.js b/src/api/ebiz/common/common.js
index 5cd00508a..d554da983 100644
--- a/src/api/ebiz/common/common.js
+++ b/src/api/ebiz/common/common.js
@@ -27,6 +27,15 @@ export function trial(data) {
   })
 }
 
+//产品售卖权限校验
+export function productCheck(data) {
+  return request({
+    url: getUrl('/sale/product/check', 1),
+    method: 'post',
+    data
+  })
+}
+
 //订单详情
 export function orderDetail(data) {
   return request({
diff --git a/src/api/ebiz/sale/sale.js b/src/api/ebiz/sale/sale.js
index 269c01e7f..3a01683d2 100644
--- a/src/api/ebiz/sale/sale.js
+++ b/src/api/ebiz/sale/sale.js
@@ -195,3 +195,11 @@ export function getPayState(data) {
   })
 }
 
+// 获取产品允许投保人单位列表
+export function getCompany(data) {
+  return request({
+    url: getUrl('/sale/product/company', 1),
+    method: 'post',
+    data
+  })
+}
diff --git a/src/assets/js/business-common.js b/src/assets/js/business-common.js
index 84c3ee530..67045bc54 100644
--- a/src/assets/js/business-common.js
+++ b/src/assets/js/business-common.js
@@ -504,6 +504,7 @@ export default {
     }
     let age = utilsAge.getAge(appntDTO.birthday, new Date())
     localStorage.saleInsuredInfo = JSON.stringify({
+      workcompany: appntDTO.workcompany,
       birthday: appntDTO.birthday,
       name: appntDTO.name,
       sex: appntDTO.sex,
diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue
index a99e48afb..7bf7a69fb 100644
--- a/src/views/ebiz/common/MainRiskList.vue
+++ b/src/views/ebiz/common/MainRiskList.vue
@@ -19,7 +19,7 @@
 </template>
 <script>
 import { Cell, CellGroup, Tag, Radio, RadioGroup } from 'vant'
-import { mainRiskList, calculatePremium } from '@/api/ebiz/common/common'
+import { mainRiskList, calculatePremium, productCheck } from '@/api/ebiz/common/common'
 import riskRules from './risk-rules'
 export default {
   name: 'mainRiskList',
@@ -81,6 +81,7 @@ export default {
         }
       }
     },
+
     //下一步
     nextStep() {
       console.log(this.result)
@@ -110,13 +111,13 @@ export default {
             }
           })
         }
-        
-        if(resultData.productTrialInfoDTO.ruleExpression){
-          let ruleExpression = localStorage.ruleExpression ? JSON.parse(localStorage.ruleExpression) : {};
+
+        if (resultData.productTrialInfoDTO.ruleExpression) {
+          let ruleExpression = localStorage.ruleExpression ? JSON.parse(localStorage.ruleExpression) : {}
           ruleExpression[resultData.productCode] = resultData.productTrialInfoDTO.ruleExpression
           localStorage.ruleExpression = JSON.stringify(ruleExpression)
         }
-        
+
         /********start 主险选择限制 start******/
 
         if (riskRules.ageLimit(resultData, this)) {
@@ -145,6 +146,18 @@ export default {
             return
           }
         }
+
+        let flagPermission = await riskRules.getProductSellPermissionList(resultData.productCode, this)
+        if (flagPermission && localStorage.isFrom != 'proposal') {
+          //校验该代理人是否有该产品的售卖权限
+          return this.$toast('抱歉，您没有该产品的销售权限！')
+        }
+
+        let flagCompany = await riskRules.checkCompany(resultData.productCode, JSON.parse(localStorage.saleInsuredInfo).workcompany, this)
+        if (flagCompany && localStorage.isFrom != 'proposal') {
+          //校验该投保人的工作单位是否能够投保该产品
+          return this.$toast('该投保人工作单位不能投保该产品')
+        }
         /********end 主险选择限制 end******/
 
         //保存附加险
diff --git a/src/views/ebiz/common/risk-rules.js b/src/views/ebiz/common/risk-rules.js
index a7c71d399..a8ed5b6b1 100644
--- a/src/views/ebiz/common/risk-rules.js
+++ b/src/views/ebiz/common/risk-rules.js
@@ -1,3 +1,6 @@
+import { productCheck } from '@/api/ebiz/common/common'
+import { getCompany } from '@/api/ebiz/sale/sale'
+
 export default {
   //投、被保险人年龄对险种的限制
   ageLimit(resultData, vm, isApplicant) {
@@ -10,8 +13,8 @@ export default {
       tips = '被保险人年龄不适合此款险种，请选择其他险种！'
     }
     let minAge = resultData.productTrialInfoDTO.ageRange && resultData.productTrialInfoDTO.ageRange.minAge
-    let maxAge = resultData.productTrialInfoDTO.ageRange && resultData.productTrialInfoDTO.ageRange.maxAge;
-    [age, minAge, maxAge] = [Number(age), Number(minAge), Number(maxAge)]
+    let maxAge = resultData.productTrialInfoDTO.ageRange && resultData.productTrialInfoDTO.ageRange.maxAge
+    ;[age, minAge, maxAge] = [Number(age), Number(minAge), Number(maxAge)]
     if (age > maxAge || age < minAge) {
       vm.$toast(tips)
       return true
@@ -69,5 +72,55 @@ export default {
   //获取投保人信息
   getSaleInsuredInfo() {
     return localStorage.saleInsuredInfo && JSON.parse(localStorage.saleInsuredInfo)
+  },
+
+  //获取产品售卖权限列表
+  getProductSellPermissionList(val, that) {
+    let flag = true
+    return new Promise((resolve, reject) => {
+      productCheck({ productCodes: [val] }).then(
+        res => {
+          if (res.result == '0') {
+            if (JSON.stringify(res.content) == '{}') {
+              flag = false
+            } else {
+              //0-有权限 1-没权限
+              flag = res.content[val] === '1' ? true : false
+            }
+          } else {
+            that.$toast(res.resultMessage)
+          }
+          resolve(flag)
+        },
+        error => {
+          reject(true)
+        }
+      )
+    })
+  },
+  //校验投保人工作单位是否有权限投保该产品
+  checkCompany(val, workcompany, that) {
+    let flag = true
+    let columns = []
+    return new Promise((resolve, reject) => {
+      getCompany({ productCodes: [val] }).then(
+        res => {
+          if (res.result == 0) {
+            columns = res.content
+            if (columns.length == 0) {
+              flag = false
+            } else {
+              flag = !columns.includes(workcompany)
+            }
+          } else {
+            that.$toast(res.resultMessage)
+          }
+          resolve(flag)
+        },
+        error => {
+          reject(true)
+        }
+      )
+    })
   }
-}
\ No newline at end of file
+}
diff --git a/src/views/ebiz/product/ProductDetail.vue b/src/views/ebiz/product/ProductDetail.vue
index 5927b504b..f70fccd60 100644
--- a/src/views/ebiz/product/ProductDetail.vue
+++ b/src/views/ebiz/product/ProductDetail.vue
@@ -98,14 +98,19 @@ export default {
     goInsure() {
       localStorage.orderNo = ''
       localStorage.chooseProductCodes = '' //置空所选险种
+      let path = `/sale/insuredInfo`
+      if (this.$route.params.productDetailCode == 'GFRSPRO_M0024') {
+        let specilFlag = '1'
+        path = `${path}?specilFlag=${specilFlag}`
+      }
       // 跳转到投保建议
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + '/#/sale/insuredInfo'
+          url: location.origin + '/#' + path
         },
         routerInfo: {
-          path: `/sale/insuredInfo`
+          path: path
         }
       })
     },
@@ -134,7 +139,7 @@ export default {
 
 <style lang="scss" scoped>
 .product-detail-container {
-  /deep/.van-sticky{
+  /deep/.van-sticky {
     background: #fff;
   }
   .product-detail-introduct-image {
@@ -156,8 +161,8 @@ export default {
     border-color: transparent;
   }
   /deep/.van-button--default {
-    background-color: #FEEFD8;
-    color: #E9332E;
+    background-color: #feefd8;
+    color: #e9332e;
   }
 }
 </style>
diff --git a/src/views/ebiz/proposal/ProposalInfo.vue b/src/views/ebiz/proposal/ProposalInfo.vue
index a634d694b..f4ade778c 100644
--- a/src/views/ebiz/proposal/ProposalInfo.vue
+++ b/src/views/ebiz/proposal/ProposalInfo.vue
@@ -300,7 +300,7 @@ import getAge from '@/assets/js/utils/age.js'
 import filters from '@/filters'
 import dataDictionary from '@/assets/js/utils/data-dictionary'
 import Layout from '../../app/layout/Layout' //使用数据字典中的险种类型
-
+import riskRules from '../common/risk-rules.js'
 export default {
   data() {
     let isWeixin = this.$utils.device().isWeixin //判断环境
@@ -601,11 +601,21 @@ export default {
       })
     },
     //转投保
-    insure() {
+    async insure() {
+      let path = '/sale/insuredInfo?edit=1'
       if (this.mainRiskCodes) {
         if (this.mainRiskCodes.length != 1) {
           return Toast.fail('暂不支持组合产品转投保')
         }
+        if (this.mainRiskCodes[0] == 'GFRS_M0024') {
+          let specilFlag = '1'
+          path = `${path}&specilFlag=${specilFlag}`
+          let flagPermission = await riskRules.getProductSellPermissionList(this.mainRiskCodes[0], this)
+          if (flagPermission) {
+            //校验该代理人是否有该产品的售卖权限
+            return Toast.fail('抱歉，您没有该产品的销售权限！')
+          }
+        }
       }
       let params = {
         proposalInfoDTO: {
@@ -619,11 +629,11 @@ export default {
           this.$jump({
             flag: 'h5',
             extra: {
-              url: location.origin + '/#/sale/insuredInfo?edit=1',
+              url: location.origin + '/#',
               backToFirst: '1'
             },
             routerInfo: {
-              path: '/sale/insuredInfo?edit=1'
+              path: path
             }
           })
         } else {
diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue
index 6364df3c5..974046253 100644
--- a/src/views/ebiz/sale/InsuredInfo.vue
+++ b/src/views/ebiz/sale/InsuredInfo.vue
@@ -250,6 +250,7 @@
         @click="toSelect('7')"
       />
       <van-field
+        v-if="specilFlag != '1'"
         v-model="userInfo.workcompany"
         required
         label="工作单位"
@@ -259,6 +260,18 @@
         maxlength="50"
         clearable
       />
+      <van-field
+        v-else
+        :value="userInfo.workcompany"
+        readonly
+        label="工作单位"
+        name="工作单位"
+        required
+        right-icon="arrow"
+        placeholder="请选择"
+        v-validate="'required'"
+        @click="toSelect('9')"
+      />
       <!-- <van-field
           v-model="areaName"
           readonly
@@ -360,7 +373,7 @@ import CustomerPicker from '@/components/ebiz/customer/CustomerPicker'
 import DataDictionary from '@/assets/js/utils/data-dictionary'
 import areaList from '@/assets/js/utils/area'
 import areaLists from '@/assets/js/utils/areaNew'
-import { saveOrUpdateOrderInfo, getAuthCode, getOrderDetail } from '@/api/ebiz/sale/sale'
+import { saveOrUpdateOrderInfo, getAuthCode, getOrderDetail, getCompany } from '@/api/ebiz/sale/sale'
 import utilsAge from '@/assets/js/utils/age'
 import getAreaName from '@/assets/js/utils/get-area-name'
 import IdentityCardScan from '@/components/ebiz/sale/IdentityCardScan'
@@ -390,6 +403,8 @@ export default {
   },
   data() {
     return {
+      specilFlag: '', //特殊显示-为桂企产品专写 1-桂企 undefind-其他
+      productCodes: [], //产品编码-用于“产品允许投保人单位列表获取”接口，作为请求参数
       isScan: false, //是否显示证件扫描组件
       sexRadio: [
         {
@@ -493,6 +508,7 @@ export default {
     }
   },
   created() {
+    this.specilFlag = this.$route.query.specilFlag
     localStorage.removeItem('bankCardUrlPath')
     localStorage.removeItem('bankCard')
     localStorage.removeItem('bankCardUrlInsuredPath')
@@ -628,26 +644,78 @@ export default {
       //pickerType 1、国家地区 2、证件类型 3、文化程度 4、有无社保(弃用) 5、税收居民身份 6、婚姻状况 7、在职情况 8、收入来源
       ;[this.popupShow, this.pickerType] = [true, pickerType]
       if (valueKey) this.valueKey = valueKey
-      if (pickerType == '1') {
-        this.columns = DataDictionary.nativeplace
-      } else if (pickerType == '2') {
-        this.columns = DataDictionary.insuredIdType
-      } else if (pickerType == '3') {
-        this.columns = DataDictionary.degree
-      } else if (pickerType == '4') {
-        this.columns = [
-          { id: 0, text: '有' },
-          { id: 1, text: '无' }
-        ]
-      } else if (pickerType == '5') {
-        this.columns = DataDictionary.taxIdentity
-      } else if (pickerType == '6') {
-        this.columns = DataDictionary.marriage
-      } else if (pickerType == '7') {
-        this.columns = DataDictionary.workCondition
-      } else if (pickerType == '8') {
-        this.columns = DataDictionary.salarySource
+
+      switch (pickerType) {
+        case '1':
+          this.columns = DataDictionary.nativeplace
+          break
+        case '2':
+          this.columns = DataDictionary.insuredIdType
+          break
+        case '3':
+          this.columns = DataDictionary.degree
+          break
+        case '4':
+          this.columns = [
+            { id: 0, text: '有' },
+            { id: 1, text: '无' }
+          ]
+          break
+        case '5':
+          this.columns = DataDictionary.taxIdentity
+          break
+        case '6':
+          this.columns = DataDictionary.marriage
+          break
+        case '7':
+          this.columns = DataDictionary.workCondition
+          break
+        case '8':
+          this.columns = DataDictionary.salarySource
+          break
+        case '9':
+          this.productCodes.length = 0
+          this.productCodes.push('GFRS_M0024')
+          getCompany({ productCodes: this.productCodes }).then(res => {
+            if (res.result == 0) {
+              this.columns = res.content
+            } else {
+              this.$toast(res.resultMessage)
+            }
+          })
+          break
       }
+
+      // if (pickerType == '1') {
+      //   this.columns = DataDictionary.nativeplace
+      // } else if (pickerType == '2') {
+      //   this.columns = DataDictionary.insuredIdType
+      // } else if (pickerType == '3') {
+      //   this.columns = DataDictionary.degree
+      // } else if (pickerType == '4') {
+      //   this.columns = [
+      //     { id: 0, text: '有' },
+      //     { id: 1, text: '无' }
+      //   ]
+      // } else if (pickerType == '5') {
+      //   this.columns = DataDictionary.taxIdentity
+      // } else if (pickerType == '6') {
+      //   this.columns = DataDictionary.marriage
+      // } else if (pickerType == '7') {
+      //   this.columns = DataDictionary.workCondition
+      // } else if (pickerType == '8') {
+      //   this.columns = DataDictionary.salarySource
+      // } else if (pickerType == '9') {
+      //   this.productCodes.length = 0
+      //   this.productCodes.push('GFRS_M0024')
+      //   getCompany({ productCodes: this.productCodes }).then(res => {
+      //     if (res.result == 0) {
+      //       this.columns = res.content
+      //     } else {
+      //       this.$toast(res.resultMessage)
+      //     }
+      //   })
+      // }
     },
     //确认选择字段
     onConfirm(value) {
@@ -675,6 +743,8 @@ export default {
         this.userInfo.jobStatus = value.id
       } else if (this.pickerType == '8') {
         this.userInfo.salarySource = value.id
+      } else if (this.pickerType == '9') {
+        this.userInfo.workcompany = value
       }
     },
     //证件起始截止日期
@@ -1115,6 +1185,7 @@ export default {
         }
       }
       let str = ''
+      let specilFlag = this.$route.query.specilFlag === '1' ? 'specilFlag=1&' : ''
       params.orderDTO.appntDTO = this.userInfo
       let resultData = await saveOrUpdateOrderInfo(params)
       if (resultData.result == 0) {
@@ -1146,10 +1217,10 @@ export default {
               this.$jump({
                 flag: 'h5',
                 extra: {
-                  url: location.origin + `/#/sale/insuredPerson?${str}`
+                  url: location.origin + `/#/sale/insuredPerson?${specilFlag}${str}`
                 },
                 routerInfo: {
-                  path: `/sale/insuredPerson?${str}`
+                  path: `/sale/insuredPerson?${specilFlag}${str}`
                 }
               })
             })
@@ -1157,10 +1228,10 @@ export default {
           this.$jump({
             flag: 'h5',
             extra: {
-              url: location.origin + `/#/sale/insuredPerson?${str}`
+              url: location.origin + `/#/sale/insuredPerson?${specilFlag}${str}`
             },
             routerInfo: {
-              path: `/sale/insuredPerson?${str}`
+              path: `/sale/insuredPerson?${specilFlag}${str}`
             }
           })
         }

From 26b5810d49ed5ee73e58b62f7f37c1ef82c2e83e Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Sat, 23 May 2020 15:42:04 +0800
Subject: [PATCH 04/14] =?UTF-8?q?[fix]=E3=80=90=E7=94=B5=E6=8A=95-?=
 =?UTF-8?q?=E6=A1=82=E4=BC=81=E3=80=91j=E5=BB=BA=E8=AE=AE=E4=B9=A6?=
 =?UTF-8?q?=E8=BD=AC=E6=8A=95=E4=BF=9D=EF=BC=8C=E8=B7=B3=E8=BD=AC=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B7=AF=E7=94=B1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/proposal/ProposalInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/ebiz/proposal/ProposalInfo.vue b/src/views/ebiz/proposal/ProposalInfo.vue
index f4ade778c..a9f51607c 100644
--- a/src/views/ebiz/proposal/ProposalInfo.vue
+++ b/src/views/ebiz/proposal/ProposalInfo.vue
@@ -629,7 +629,7 @@ export default {
           this.$jump({
             flag: 'h5',
             extra: {
-              url: location.origin + '/#',
+              url: location.origin + '/#' + path,
               backToFirst: '1'
             },
             routerInfo: {

From 8b92ffd12f0a406bd5ebf409acfb08cd5129799f Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Sat, 23 May 2020 20:30:07 +0800
Subject: [PATCH 05/14] =?UTF-8?q?[FIX]=E3=80=90=E6=A1=82=E4=BC=81=E3=80=91?=
 =?UTF-8?q?pdf=E5=BB=BA=E8=AE=AE=E4=B9=A6=E5=88=86=E4=BA=ABtitle=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=AD=97=E5=85=B8=E6=9B=B4=E6=96=B0=EF=BC=9B=E5=BB=BA?=
 =?UTF-8?q?=E8=AE=AE=E4=B9=A6=E9=A2=84=E8=A7=88=E9=A1=B5=E9=9D=A2=E5=B7=A6?=
 =?UTF-8?q?=E4=B8=8A=E8=A7=92=E3=80=90=E8=BF=94=E5=9B=9E=E3=80=91=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=94=B9=E4=B8=BA=C3=97=EF=BC=9B=E4=BB=8E=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E4=B8=AD=E5=BF=83=E6=A1=82=E4=BC=81=E5=85=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E6=8A=95=E4=BF=9D-=E4=B8=BB=E9=99=A9?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=A1=B5=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E6=A1=82=E4=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/utils/data-dictionary.js   |  5 +++
 src/views/ebiz/common/MainRiskList.vue   | 44 ++++++++++++++++++++++--
 src/views/ebiz/proposal/List.vue         | 13 +++++--
 src/views/ebiz/proposal/ProposalInfo.vue | 25 ++++++++++++++
 src/views/ebiz/sale/InsuredInfo.vue      | 24 ++++++++++---
 5 files changed, 100 insertions(+), 11 deletions(-)

diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js
index 95eef0020..b7ca0394b 100644
--- a/src/assets/js/utils/data-dictionary.js
+++ b/src/assets/js/utils/data-dictionary.js
@@ -944,6 +944,11 @@ export default {
       shortName: '重疾险',
       name: '国富人寿爱易保重大疾病保险',
       code: 'GFRS_M0021'
+    },
+    {
+      shortName: '重疾险',
+      name: '国富人寿桂企保重大疾病保险',
+      code: 'GFRS_M0024'
     }
   ],
   // 职级
diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue
index 7bf7a69fb..9c327723f 100644
--- a/src/views/ebiz/common/MainRiskList.vue
+++ b/src/views/ebiz/common/MainRiskList.vue
@@ -19,7 +19,9 @@
 </template>
 <script>
 import { Cell, CellGroup, Tag, Radio, RadioGroup } from 'vant'
-import { mainRiskList, calculatePremium, productCheck } from '@/api/ebiz/common/common'
+import { mainRiskList, calculatePremium } from '@/api/ebiz/common/common'
+import { getOrderDetail } from '@/api/ebiz/sale/sale'
+
 import riskRules from './risk-rules'
 export default {
   name: 'mainRiskList',
@@ -32,14 +34,43 @@ export default {
   },
   data() {
     return {
+      specilFlag: '0',
+      flag: true,
       list: [],
       result: '',
       delList: [],
       radioVal: ''
     }
   },
-  mounted() {
-    this.getMainRiskList()
+  async mounted() {
+    if (localStorage.isFrom == 'sale') {
+      return new Promise((resolve, reject) => {
+        getOrderDetail({ orderNo: localStorage.orderNo }).then(
+          res => {
+            if (res.result == 0) {
+              //------------------------专为桂企写死--begin---------------//
+              if (res.orderDTO.insuredDTOs[0] && res.orderDTO.insuredDTOs[0].riskDTOLst) {
+                this.flag = this.specilFlag = res.orderDTO.insuredDTOs[0].riskDTOLst.some(v => {
+                  return v.riskCode == 'GFRS_M0024'
+                })
+                if (this.flag) {
+                  this.specilFlag = '1'
+                }
+              } else if (res.orderDTO.orderInfoDTO.productCode == 'GFRS_M0024') {
+                this.specilFlag = '1'
+              }
+              // ------------------------专为桂企写死--end---------------//
+            }
+            resolve(this.getMainRiskList())
+          },
+          error => {
+            reject(this.getMainRiskList())
+          }
+        )
+      })
+    } else {
+      this.getMainRiskList()
+    }
   },
   methods: {
     //获取主险列表
@@ -64,6 +95,13 @@ export default {
           }
         }
         this.list = resultData.mainRiskDTOS
+        //------------------------专为桂企写死--begin---------------//
+        if (this.list.length > 0 && this.flag && localStorage.isFrom == 'sale') {
+          this.result = this.list.find(v => {
+            return v.riskProductCode == 'GFRS_M0024'
+          })
+        }
+        // ------------------------专为桂企写死--end---------------//
 
         if (this.list.length == 0) {
           this.$dialog({ message: '暂无可选产品!' }).then(() => {
diff --git a/src/views/ebiz/proposal/List.vue b/src/views/ebiz/proposal/List.vue
index d270f7fc3..f98990778 100644
--- a/src/views/ebiz/proposal/List.vue
+++ b/src/views/ebiz/proposal/List.vue
@@ -84,6 +84,7 @@
 import { Tabs, Tab, Tag, Dialog, List, Sticky, Toast } from 'vant'
 import { getList, toInsurance, deleteProposal } from '@/api/ebiz/proposal/proposal.js'
 import { formatRiskList } from '@/assets/js/utils/formatRiskList.js'
+import riskRules from '../common/risk-rules.js'
 
 export default {
   name: 'proposalList',
@@ -245,11 +246,17 @@ export default {
       })
     },
     //转投保
-    toInsurance(item) {
-      console.log(item.insuredDTOs[0].mainRisk.length)
-      if(item.insuredDTOs[0].mainRisk.length == '2') {
+    async toInsurance(item) {
+      if (item.insuredDTOs[0].mainRisk.length == '2') {
         return Toast.fail('暂不支持组合产品转投保')
       }
+      let flag = item.insuredDTOs[0].riskDTOLst.some(v => {
+        return v.riskCode == 'GFRS_M0024'
+      })
+      if (flag && (await riskRules.getProductSellPermissionList('GFRS_M0024', this))) {
+        return this.$toast('抱歉，您没有该产品的销售权限！')
+      }
+
       let params = {
         proposalInfoDTO: {
           proposalNo: item.orderInfoDTO.orderNo
diff --git a/src/views/ebiz/proposal/ProposalInfo.vue b/src/views/ebiz/proposal/ProposalInfo.vue
index a9f51607c..635a7340b 100644
--- a/src/views/ebiz/proposal/ProposalInfo.vue
+++ b/src/views/ebiz/proposal/ProposalInfo.vue
@@ -363,6 +363,15 @@ export default {
     }
   },
   mounted() {
+    setTimeout(() => {
+      // eslint-disable-next-line no-undef
+      EWebBridge.webCallAppInJs('webview_left_button', {
+        img: this.$assetsUrl + 'images/del-close-btn@3x.png',
+        intercept: '1' //是否拦截原生返回事件 1是 其他否
+      })
+    }, 100)
+    window.appCallBack = this.appCallBack
+
     localStorage.setItem('pdfShareCode', '')
     document.body.style.backgroundColor = '#fff'
     /*setTimeout(() => {
@@ -384,6 +393,22 @@ export default {
     next()
   },
   methods: {
+    appCallBack(data) {
+      if (data.trigger == 'left_button_click') {
+        this.$jump({
+          flag: 'h5',
+          extra: {
+            title: '建议书列表',
+            forbidSwipeBack: 1, //当前页面禁止右滑返回
+            url: location.origin + `/#/proposal/list`
+          },
+          routerInfo: {
+            path: `/proposal/list`,
+            type: '1'
+          }
+        })
+      }
+    },
     initDutyColor(code) {
       if (code) {
         return code.replace(new RegExp('<span>', 'g'), '<span style="color: #3a81f6;font-weight: 600;">')
diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue
index 974046253..3fa367eef 100644
--- a/src/views/ebiz/sale/InsuredInfo.vue
+++ b/src/views/ebiz/sale/InsuredInfo.vue
@@ -551,6 +551,18 @@ export default {
             ]) //获取家庭地址
             this.census = getAreaName([{ code: res.orderDTO.appntDTO.householdProvince }, { code: res.orderDTO.appntDTO.householdCity }]) //获取户籍
           }
+          //------------------------专为桂企写死--begin---------------//
+          if (res.orderDTO.insuredDTOs[0] && res.orderDTO.insuredDTOs[0].riskDTOLst) {
+            console.log('------------')
+            this.specilFlag = res.orderDTO.insuredDTOs[0].riskDTOLst.some(v => {
+              return v.riskCode == 'GFRS_M0024'
+            })
+              ? '1'
+              : '0'
+          } else if (res.orderDTO.orderInfoDTO.productCode == 'GFRS_M0024') {
+            this.specilFlag = '1'
+          }
+          // ------------------------专为桂企写死--end---------------//
         }
       })
     } else {
@@ -1185,8 +1197,10 @@ export default {
         }
       }
       let str = ''
-      let specilFlag = this.$route.query.specilFlag === '1' ? 'specilFlag=1&' : ''
       params.orderDTO.appntDTO = this.userInfo
+      if (this.specilFlag == '1') {
+        params.orderDTO.orderInfoDTO.productCode = 'GFRS_M0024'
+      }
       let resultData = await saveOrUpdateOrderInfo(params)
       if (resultData.result == 0) {
         //deleteFlag 0-该页面修改了信息且修改的信息影响到后面流程，后台进行了删除数据的操作
@@ -1217,10 +1231,10 @@ export default {
               this.$jump({
                 flag: 'h5',
                 extra: {
-                  url: location.origin + `/#/sale/insuredPerson?${specilFlag}${str}`
+                  url: location.origin + `/#/sale/insuredPerson?${str}`
                 },
                 routerInfo: {
-                  path: `/sale/insuredPerson?${specilFlag}${str}`
+                  path: `/sale/insuredPerson?${str}`
                 }
               })
             })
@@ -1228,10 +1242,10 @@ export default {
           this.$jump({
             flag: 'h5',
             extra: {
-              url: location.origin + `/#/sale/insuredPerson?${specilFlag}${str}`
+              url: location.origin + `/#/sale/insuredPerson?${str}`
             },
             routerInfo: {
-              path: `/sale/insuredPerson?${specilFlag}${str}`
+              path: `/sale/insuredPerson?${str}`
             }
           })
         }

From c15d450ce549f8449b3d109b6227304ff5b8ade6 Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Sat, 23 May 2020 20:54:17 +0800
Subject: [PATCH 06/14] =?UTF-8?q?[FIX]=E3=80=90=E5=BB=BA=E8=AE=AE=E4=B9=A6?=
 =?UTF-8?q?=E3=80=91=E5=BB=BA=E8=AE=AE=E4=B9=A6=E9=A2=84=E8=A7=88=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=B7=A6=E4=B8=8A=E8=A7=92=C3=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/proposal/ProposalInfo.vue | 32 ++++++++++++------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/views/ebiz/proposal/ProposalInfo.vue b/src/views/ebiz/proposal/ProposalInfo.vue
index 635a7340b..393f02b7c 100644
--- a/src/views/ebiz/proposal/ProposalInfo.vue
+++ b/src/views/ebiz/proposal/ProposalInfo.vue
@@ -393,22 +393,6 @@ export default {
     next()
   },
   methods: {
-    appCallBack(data) {
-      if (data.trigger == 'left_button_click') {
-        this.$jump({
-          flag: 'h5',
-          extra: {
-            title: '建议书列表',
-            forbidSwipeBack: 1, //当前页面禁止右滑返回
-            url: location.origin + `/#/proposal/list`
-          },
-          routerInfo: {
-            path: `/proposal/list`,
-            type: '1'
-          }
-        })
-      }
-    },
     initDutyColor(code) {
       if (code) {
         return code.replace(new RegExp('<span>', 'g'), '<span style="color: #3a81f6;font-weight: 600;">')
@@ -512,6 +496,7 @@ export default {
     //app回调
     appCallBack(data) {
       if (data.trigger == 'right_button_click') {
+        // eslint-disable-next-line no-undef
         EWebBridge.webCallAppInJs('bridge', {
           flag: 'share',
           extra: {
@@ -523,8 +508,23 @@ export default {
           }
         })
       }
+      if (data.trigger == 'left_button_click') {
+        this.$jump({
+          flag: 'h5',
+          extra: {
+            title: '建议书列表',
+            forbidSwipeBack: 1, //当前页面禁止右滑返回
+            url: location.origin + `/#/proposal/list`
+          },
+          routerInfo: {
+            path: `/proposal/list`,
+            type: '1'
+          }
+        })
+      }
     },
     sharePeople() {
+      // eslint-disable-next-line no-undef
       EWebBridge.webCallAppInJs('bridge', {
         flag: 'share',
         extra: {

From a932677a45ecc287890dbca50f1cbe31aaebf9ee Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Sat, 23 May 2020 21:03:01 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E3=80=90=E5=BB=BA=E8=AE=AE=E4=B9=A6?=
 =?UTF-8?q?=E3=80=91=E5=BB=BA=E8=AE=AE=E4=B9=A6=E9=A2=84=E8=A7=88=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=B7=A6=E4=B8=8A=E8=A7=92=C3=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/proposal/ProposalInfo.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/ebiz/proposal/ProposalInfo.vue b/src/views/ebiz/proposal/ProposalInfo.vue
index 393f02b7c..8f00dd6f1 100644
--- a/src/views/ebiz/proposal/ProposalInfo.vue
+++ b/src/views/ebiz/proposal/ProposalInfo.vue
@@ -514,6 +514,7 @@ export default {
           extra: {
             title: '建议书列表',
             forbidSwipeBack: 1, //当前页面禁止右滑返回
+            backToFirst: 1,
             url: location.origin + `/#/proposal/list`
           },
           routerInfo: {

From 44af90aaaaa8aef346a0bf312a4ea962830de57a Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Sat, 23 May 2020 21:09:40 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E3=80=90=E5=BB=BA=E8=AE=AE=E4=B9=A6?=
 =?UTF-8?q?=E3=80=91=E5=BB=BA=E8=AE=AE=E4=B9=A6=E9=A2=84=E8=A7=88=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=B7=A6=E4=B8=8A=E8=A7=92=C3=97=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=BB=BA=E8=AE=AE=E4=B9=A6=E5=88=97=E8=A1=A8=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/proposal/List.vue         | 15 +++++++++++++++
 src/views/ebiz/proposal/ProposalInfo.vue |  1 -
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/views/ebiz/proposal/List.vue b/src/views/ebiz/proposal/List.vue
index f98990778..e06fab055 100644
--- a/src/views/ebiz/proposal/List.vue
+++ b/src/views/ebiz/proposal/List.vue
@@ -111,11 +111,26 @@ export default {
   },
   created() {
     // document.body.style.backgroundColor = '#F5F5F5'
+    setTimeout(() => {
+      // eslint-disable-next-line no-undef
+      EWebBridge.webCallAppInJs('webview_left_button', {
+        intercept: '1' //是否拦截原生返回事件 1是 其他否
+      })
+    }, 100)
+    window.appCallBack = this.appCallBack
   },
   mounted() {
     this.loadMore()
   },
   methods: {
+    appCallBack(data) {
+      if (data.trigger == 'left_button_click') {
+        this.$jump({
+          flag: 'home',
+          extra: {}
+        })
+      }
+    },
     //获取建议书列表
     getProposalList(tabType, pageInfo) {
       let status = '0' + tabType
diff --git a/src/views/ebiz/proposal/ProposalInfo.vue b/src/views/ebiz/proposal/ProposalInfo.vue
index 8f00dd6f1..393f02b7c 100644
--- a/src/views/ebiz/proposal/ProposalInfo.vue
+++ b/src/views/ebiz/proposal/ProposalInfo.vue
@@ -514,7 +514,6 @@ export default {
           extra: {
             title: '建议书列表',
             forbidSwipeBack: 1, //当前页面禁止右滑返回
-            backToFirst: 1,
             url: location.origin + `/#/proposal/list`
           },
           routerInfo: {

From 8e75e24ae674b4132dcf43d97c92f12a14c413d7 Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Mon, 25 May 2020 10:39:46 +0800
Subject: [PATCH 09/14] =?UTF-8?q?[fix]=E3=80=90=E7=94=B5=E6=8A=95=E3=80=91?=
 =?UTF-8?q?=E6=A1=82=E4=BC=81-=E4=B8=BB=E9=99=A9=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=A1=B5=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/common/MainRiskList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue
index 9c327723f..517553ce5 100644
--- a/src/views/ebiz/common/MainRiskList.vue
+++ b/src/views/ebiz/common/MainRiskList.vue
@@ -96,7 +96,7 @@ export default {
         }
         this.list = resultData.mainRiskDTOS
         //------------------------专为桂企写死--begin---------------//
-        if (this.list.length > 0 && this.flag && localStorage.isFrom == 'sale') {
+        if (this.list.length > 0 && this.specilFlag == '1' && localStorage.isFrom == 'sale') {
           this.result = this.list.find(v => {
             return v.riskProductCode == 'GFRS_M0024'
           })

From 7b688702f3d760098a2dc837532368abcfa75318 Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Mon, 25 May 2020 13:59:48 +0800
Subject: [PATCH 10/14] =?UTF-8?q?[fix]=E3=80=90=E9=80=9A=E7=94=A8=E5=B9=B4?=
 =?UTF-8?q?=E9=BE=84=E6=A0=A1=E9=AA=8C=E6=96=B9=E6=B3=95=E3=80=91src/asset?=
 =?UTF-8?q?s/js/utils/age.js=E6=96=87=E4=BB=B6getDateDiff=EF=BC=88?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E4=B8=A4=E4=B8=AA=E6=97=A5=E6=9C=9F=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=B7=AE=EF=BC=89=E6=96=B9=E6=B3=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/utils/age.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/assets/js/utils/age.js b/src/assets/js/utils/age.js
index 373a426ee..69eb43fbd 100644
--- a/src/assets/js/utils/age.js
+++ b/src/assets/js/utils/age.js
@@ -1,12 +1,12 @@
 export default {
-  getAge: function (name, today) {
+  getAge: function(name, today) {
     return this.getAgeByValue(name, today)
   },
 
-  getAgeByBirth: function (value, today) {
+  getAgeByBirth: function(value, today) {
     return this.getAgeByValue(value, today)
   },
-  getAgeByValue: function (value, today) {
+  getAgeByValue: function(value, today) {
     var b = value.match(/^(\d{1,4})(-|\/)(\d{1,2})\2(\d{1,2})$/)
     if (b == null) {
       return null
@@ -33,7 +33,7 @@ export default {
   /**
    * 取得两个日期的时间差
    */
-  getDateDiff: function (date1, date2) {
+  getDateDiff: function(date1, date2) {
     var dt1, dt2
     if (date1 instanceof Date) {
       dt1 = date1
@@ -45,13 +45,14 @@ export default {
     } else {
       dt2 = this.stringToDate(date2)
     }
-    return (dt2.getTime() - dt1.getTime()) / (1000 * 3600 * 24) + 1
+    return (dt2.getTime() - dt1.getTime()) / (1000 * 3600 * 24)
+    // return (dt2.getTime() - dt1.getTime()) / (1000 * 3600 * 24) + 1
   },
 
   /**
    * 字符串转日期
    */
-  stringToDate: function (string) {
+  stringToDate: function(string) {
     return new Date(Date.parse(string.replace(/-/g, '/')))
   }
 }

From 2008d20fa888c27e3c0a56ec925bfea4ae138c16 Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Mon, 25 May 2020 14:19:33 +0800
Subject: [PATCH 11/14] =?UTF-8?q?[FIX]=E3=80=90=E9=A6=96=E9=A1=B5=E6=A1=82?=
 =?UTF-8?q?=E4=BC=81=E4=BF=9D=E6=8A=95=E4=BF=9D=E5=85=A5=E5=8F=A3=E3=80=91?=
 =?UTF-8?q?=E4=BB=8E=E6=AD=A4=E5=A4=84=E8=BF=9B=E5=85=A5=E6=8A=95=E4=BF=9D?=
 =?UTF-8?q?=E4=BA=BA=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E7=BD=AE=E7=A9=BAlocalStorage.orderNo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/InsuredInfo.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue
index 3fa367eef..e67973a8c 100644
--- a/src/views/ebiz/sale/InsuredInfo.vue
+++ b/src/views/ebiz/sale/InsuredInfo.vue
@@ -517,6 +517,12 @@ export default {
     localStorage.removeItem('imgfrontInsuredPath')
     localStorage.removeItem('imgBackPath')
     localStorage.removeItem('imgBackInsuredPath')
+    //--------------为首页桂企保投保入口专写begin----------------//
+    if (this.$route.query.initOrderNo == '1') {
+      localStorage.orderNo = ''
+    }
+    //--------------为首页桂企保投保入口专写end----------------//
+
     // document.body.style.backgroundColor = '#F5F5F5'
     //如果是编辑/导航进来
     this.isElecCont = '0'

From 7ffa9bbc3710f0d029aef480b37c160eb14a945e Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Mon, 25 May 2020 14:38:54 +0800
Subject: [PATCH 12/14] =?UTF-8?q?[FIX]=E3=80=90=E9=A6=96=E9=A1=B5=E6=A1=82?=
 =?UTF-8?q?=E4=BC=81=E4=BF=9D=E6=8A=95=E4=BF=9D=E5=85=A5=E5=8F=A3=E3=80=91?=
 =?UTF-8?q?=E4=BB=8E=E6=AD=A4=E5=A4=84=E8=BF=9B=E5=85=A5=E6=8A=95=E4=BF=9D?=
 =?UTF-8?q?=E4=BA=BA=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E7=BD=AE=E7=A9=BAlocalStorage.chooseProductCodes(=E6=89=80?=
 =?UTF-8?q?=E9=80=89=E9=99=A9=E7=A7=8D)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/InsuredInfo.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue
index e67973a8c..2d02fb54d 100644
--- a/src/views/ebiz/sale/InsuredInfo.vue
+++ b/src/views/ebiz/sale/InsuredInfo.vue
@@ -520,6 +520,7 @@ export default {
     //--------------为首页桂企保投保入口专写begin----------------//
     if (this.$route.query.initOrderNo == '1') {
       localStorage.orderNo = ''
+      localStorage.chooseProductCodes = '' //置空所选险种
     }
     //--------------为首页桂企保投保入口专写end----------------//
 

From 06f6cbab20faeb80bb44ece5129ac82c2b8f5e28 Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Mon, 25 May 2020 16:37:01 +0800
Subject: [PATCH 13/14] =?UTF-8?q?[FIX]=E3=80=90=E7=94=B5=E6=8A=95=E3=80=91?=
 =?UTF-8?q?=E6=A1=82=E4=BC=81=E5=B9=B2=E6=8E=89=E6=97=A0=E7=94=A8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/InsuredInfo.vue | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue
index 2d02fb54d..a0e3311d1 100644
--- a/src/views/ebiz/sale/InsuredInfo.vue
+++ b/src/views/ebiz/sale/InsuredInfo.vue
@@ -517,12 +517,6 @@ export default {
     localStorage.removeItem('imgfrontInsuredPath')
     localStorage.removeItem('imgBackPath')
     localStorage.removeItem('imgBackInsuredPath')
-    //--------------为首页桂企保投保入口专写begin----------------//
-    if (this.$route.query.initOrderNo == '1') {
-      localStorage.orderNo = ''
-      localStorage.chooseProductCodes = '' //置空所选险种
-    }
-    //--------------为首页桂企保投保入口专写end----------------//
 
     // document.body.style.backgroundColor = '#F5F5F5'
     //如果是编辑/导航进来
@@ -560,7 +554,6 @@ export default {
           }
           //------------------------专为桂企写死--begin---------------//
           if (res.orderDTO.insuredDTOs[0] && res.orderDTO.insuredDTOs[0].riskDTOLst) {
-            console.log('------------')
             this.specilFlag = res.orderDTO.insuredDTOs[0].riskDTOLst.some(v => {
               return v.riskCode == 'GFRS_M0024'
             })
@@ -866,7 +859,6 @@ export default {
           hiddenRight: '1'
         }
       })
-      // console.log(data)
       let { customerName, customerSex } = data
       this.userInfo.name = customerName //用户名
       this.userInfo.sex = String(customerSex) //性别
@@ -1205,9 +1197,11 @@ export default {
       }
       let str = ''
       params.orderDTO.appntDTO = this.userInfo
+      //------------------------专为桂企写死--begin---------------//
       if (this.specilFlag == '1') {
         params.orderDTO.orderInfoDTO.productCode = 'GFRS_M0024'
       }
+      // ------------------------专为桂企写死--end---------------//
       let resultData = await saveOrUpdateOrderInfo(params)
       if (resultData.result == 0) {
         //deleteFlag 0-该页面修改了信息且修改的信息影响到后面流程，后台进行了删除数据的操作

From 313ee92f3bdd9fadfedbb6cf76e8c2b37e64f74d Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Tue, 26 May 2020 11:53:05 +0800
Subject: [PATCH 14/14] =?UTF-8?q?[FIX]=E3=80=90=E6=A1=82=E4=BC=81=E3=80=91?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=88=97=E8=A1=A8=E5=B8=A6=E5=85=A5=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF-=E5=B0=86=E5=B7=A5=E4=BD=9C=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=A9=BA=EF=BC=9B=E4=BA=A7=E5=93=81=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E6=8A=95=E4=BF=9D=E6=8C=89=E9=92=AE=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=94=AE=E5=8D=96=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/product/ProductDetail.vue | 12 +++++++++++-
 src/views/ebiz/sale/InsuredInfo.vue      |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/views/ebiz/product/ProductDetail.vue b/src/views/ebiz/product/ProductDetail.vue
index f70fccd60..63d7db995 100644
--- a/src/views/ebiz/product/ProductDetail.vue
+++ b/src/views/ebiz/product/ProductDetail.vue
@@ -31,6 +31,8 @@
 <script>
 import { Tab, Tabs, List, Row, Col, Icon, Cell, Sticky } from 'vant'
 import { getProductInfo } from '@/api/ebiz/product/product.js'
+import riskRules from '../common/risk-rules.js'
+
 export default {
   components: {
     [Tab.name]: Tab,
@@ -95,13 +97,21 @@ export default {
         }
       })
     },
-    goInsure() {
+    async goInsure() {
       localStorage.orderNo = ''
       localStorage.chooseProductCodes = '' //置空所选险种
       let path = `/sale/insuredInfo`
+      let flagPermission = true
       if (this.$route.params.productDetailCode == 'GFRSPRO_M0024') {
+        flagPermission = await riskRules.getProductSellPermissionList('GFRS_M0024', this)
         let specilFlag = '1'
         path = `${path}?specilFlag=${specilFlag}`
+      } else {
+        flagPermission = false
+      }
+      if (flagPermission) {
+        //校验该代理人是否有该产品的售卖权限
+        return this.$toast('抱歉，您没有该产品的销售权限！')
       }
       // 跳转到投保建议
       this.$jump({
diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue
index a0e3311d1..66b8415b6 100644
--- a/src/views/ebiz/sale/InsuredInfo.vue
+++ b/src/views/ebiz/sale/InsuredInfo.vue
@@ -885,7 +885,7 @@ export default {
       this.userInfo.medical = data.socialSecurity //有无社保
       this.userInfo.taxResidentId = data.residentStatus //税收居民身份
       this.userInfo.averageAnnualIncome = data.averageYearlyIncome //平均年收入
-      this.userInfo.workcompany = data.workUnits //工作单位
+      this.userInfo.workcompany = this.specilFlag == '1' ? '' : data.workUnits //工作单位
       this.userInfo.jobStatus = data.jobStatus //工作情况
       this.userInfo.marriage = data.marryStatus //婚姻状况
       this.userInfo.familyAnnualIncome = data.familyAnnualIncome //家庭年收入