From 5f9eb5889e496edb2522c93e3a5d4f45c6a849d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=96=B9=E6=B3=A2?= <wang.fangbo@ebiz-fooge.com>
Date: Thu, 26 Sep 2019 09:23:36 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=94=B5=E6=8A=95=E3=80=91=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=BF=9D=E8=B4=B9=E7=AE=97=E4=BF=9D=E9=A2=9D=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/common/AddRiskList.vue      |  8 ++++++--
 src/views/ebiz/common/CalculatePremium.vue | 17 ++++++++++++-----
 src/views/ebiz/common/MainRiskList.vue     |  9 +++++++--
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/views/ebiz/common/AddRiskList.vue b/src/views/ebiz/common/AddRiskList.vue
index cef5a4d45..c9e6e552f 100644
--- a/src/views/ebiz/common/AddRiskList.vue
+++ b/src/views/ebiz/common/AddRiskList.vue
@@ -163,8 +163,12 @@ export default {
           productTrialInfoDTO[item.code].forEach(factor => {
             item = Object.assign(item, factor)
           })
-          item['amt'] = Number(item.minAmt) * Number(item.moneyUnit)
-          item['oldMaxAmt'] = item.maxAmt
+          if (item.code == 'inputPrem') {
+            item['inputPrem'] = Number(item.minPrem) * Number(item.moneyUnit)
+          } else {
+            item['amt'] = Number(item.minAmt) * Number(item.moneyUnit)
+            item['oldMaxAmt'] = item.maxAmt
+          }
         }
         //规则储存
         item['rules'] = productTrialInfoDTO[item.code]
diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index 6daea9908..252ed75c1 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -13,7 +13,7 @@
         <van-tag type="primary" v-if="item.isMainRisk == 0" class="mr5 green" plain>主险</van-tag>
         <van-tag type="primary" v-else class="mr5 green" plain>附加险</van-tag>
         <span class="ml5 center fs13 flex1"> {{ item.riskName }} </span>
-        <van-tag type="primary" v-if="item.isMainRisk == 0" plain @click="selectAddtionRisk" class="green mr8">附</van-tag>
+        <van-tag type="primary" v-if="item.isMainRisk == 0 && item.hasAddtionRisk" plain @click="selectAddtionRisk" class="green mr8">附</van-tag>
         <van-icon name="search" size="20" v-if="item.documentDTOS && item.documentDTOS.length > 0" @click="seeDocument(index)" class="green mr5" />
         <van-icon name="delete" size="22" @click="deleteRisk(index)" class="green" />
       </div>
@@ -26,8 +26,8 @@
               <span v-else class="fs14"> {{ riskFactor.name }} &nbsp;&nbsp; &nbsp;&nbsp;</span>
               <van-stepper
                 v-model="item.calFactorLst[riskFactorIndex].defaultValue"
-                :min="riskFactor.minAmt"
-                :max="riskFactor.maxAmt"
+                :min="riskFactor.minAmt || riskFactor.minPrem"
+                :max="riskFactor.maxAmt || riskFactor.maxPrem"
                 class="ml10"
                 @change="stepperChange(item.calFactorLst[riskFactorIndex].defaultValue, index, riskFactorIndex)"
                 input-width="100"
@@ -64,9 +64,12 @@
       </div>
 
       <div class="flex justify-content-s pv10 border-bottom prem">
-        <span style="font-weight:bold">
+        <span style="font-weight:bold" v-if="trialList.length > 0 && trialList[index].trialType == 0">
           首期保费(元）：
         </span>
+        <span style="font-weight:bold" v-else>
+          保额(元）：
+        </span>
         <span class="fee red" v-if="trialList && trialList.length > 0">{{ trialList[index].prem.toFixed(2) | moneyFormat }}</span>
       </div>
     </div>
@@ -505,7 +508,11 @@ export default {
               trialInfo[factor.code] = factor[factor.code]
             }
           } else if (factor.type == 1) {
-            trialInfo['amt'] = Number(factor.defaultValue) * Number(factor.moneyUnit)
+            if (factor.code == 'inputPrem') {
+              trialInfo['prem'] = Number(factor.defaultValue) * Number(factor.moneyUnit)
+            } else {
+              trialInfo['amt'] = Number(factor.defaultValue) * Number(factor.moneyUnit)
+            }
           } else if (factor.type == 2) {
             trialInfo[factor.extra] = this.saleInsuredPersonInfo[factor.code]
           }
diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue
index 0b56793c7..46db9921b 100644
--- a/src/views/ebiz/common/MainRiskList.vue
+++ b/src/views/ebiz/common/MainRiskList.vue
@@ -117,9 +117,10 @@ export default {
         //保存附加险
         localStorage.addtionRiskLst = JSON.stringify(resultData.productTrialInfoDTO.addtionRiskLst)
         let calFactorLst = this.getFactorList(resultData)
-
+        let hasAddtionRisk = resultData.productTrialInfoDTO.addtionRiskLst ? true : false
         let currentProductInfo = {
           calFactorLst,
+          hasAddtionRisk,
           isMainRisk: 0,
           riskName: this.result.riskName,
           productCode: this.result.riskProductCode,
@@ -169,7 +170,11 @@ export default {
           productTrialInfoDTO[item.code].forEach(factor => {
             item = Object.assign(item, factor)
           })
-          item['amt'] = Number(item.minAmt) * Number(item.moneyUnit)
+          if (item.code == 'inputPrem') {
+            item['inputPrem'] = Number(item.minPrem) * Number(item.moneyUnit)
+          } else {
+            item['amt'] = Number(item.minAmt) * Number(item.moneyUnit)
+          }
         }
         //规则储存
         item['rules'] = productTrialInfoDTO[item.code]