Merge branch '新增保险' into dev

src/views/ebiz/common/CalculatePremium.vue

@@ -361,10 +361,14 @@ export default {
       this.chooseProducts.map(item => {
         if (item.mainRiskCode === 'GFRS_M0005' || item.mainRiskCode === 'GFRS_M0016') {
           const orderNo = localStorage.getItem('orderNo')
-          let detailPromise = this.isFrom === 'proposal' ? getDemo({ proposalInfoDTO: { proposalNo: orderNo } }) : getOrderDetail({ orderNo })
+          let detailPromise = this.isFrom === 'proposal' ? new Promise(r => r(localStorage.getItem('proposalMedical'))) : getOrderDetail({ orderNo })
           detailPromise.then(res => {
-            if (this.isFrom === 'proposal') res = res.content
-            const isMedical = res.orderDTO.insuredDTOs[0].medical === '0'
+            let isMedical = null
+            if (this.isFrom === 'proposal') {
+              isMedical = res
+            } else {
+              isMedical = res.orderDTO.insuredDTOs[0].medical === '0'
+            }
             //根据社保写死两个字段 赔付比例和免赔额
             item.calFactorLst.map(i => {
               //免赔额

src/views/ebiz/proposal/InsuredPerson.vue

@@ -224,6 +224,9 @@ export default {
     },
     //点击下一步
     nextStep() {
+      //保存有没有社保，在保费计算用到
+      localStorage.setItem('proposalMedical', this.insured.medical === '0' ? '1' : '0')
+
       this.insured.age = String(this.insured.age)
       let cacheSex = JSON.parse(localStorage.proposalAppnt).sex
       let localSex = this.insured.sex