diff --git a/.gitignore b/.gitignore
index a0dddc6fb..f9e78f3b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw?
+.history/
diff --git a/src/views/ebiz/common/AddRiskList.vue b/src/views/ebiz/common/AddRiskList.vue
index 00fe65883..f0505e89b 100644
--- a/src/views/ebiz/common/AddRiskList.vue
+++ b/src/views/ebiz/common/AddRiskList.vue
@@ -63,14 +63,7 @@ export default {
         this.$toast('请选择产品')
         return
       }
-      //930折中方案，豁免险选择
-      let chooseProducts = JSON.parse(localStorage.chooseProducts)
-      for (let i = 0; i < chooseProducts.length; i++) {
-        if (chooseProducts[i].productCode == 'DCRS_A0001' && this.result.productCode == 'DCRS_A0001') {
-          this.$toast('豁免险已选！')
-          return
-        }
-      }
+
       //添加附加险
       this.addAddtionRisk()
     },
@@ -178,7 +171,7 @@ export default {
     },
     //豁免险影响
     remitLimit(resultData) {
-      //isRemit 0是豁免险 1非豁免险  remitType 0投保人 1被保人
+      //isRemit 0是豁免险 1非豁免险  remitType 0投保人 1被保人  relationToAppnt 投被关系
       let isRemit = resultData.productTrialInfoDTO.isRemit
       if (isRemit == 1) return false
       let remitType = resultData.productTrialInfoDTO.remitType
diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index 727b828a0..07e942e71 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -141,10 +141,7 @@
         label="预计转入保费"
         placeholder="请输入"
       />
-      <div
-        class="flex justify-content-s pv10 border-bottom"
-        v-if="isRelated && isFrom != 'proposal'"
-      >
+      <div class="flex justify-content-s pv10 border-bottom" v-if="isRelated && isFrom != 'proposal'">
         <van-field
           v-model="policyNo"
           clearable
@@ -263,7 +260,7 @@ export default {
         }
         if (item.mainRiskCode != 'GFRS_M0008') {
           item.calFactorLst.map(i => {
-            this.defalutAmt = i.displayAmount
+            this.defalutAmt = i.displayAmount || 1
             console.log(i.displayAmount)
             console.log(i.defaultValue)
             this.mult = Number(i.displayAmount) / Number(i.defaultValue)
@@ -546,7 +543,6 @@ export default {
         }
       }
 
-      //2、豁免险跟主险联动，值减一
       //2、豁免险跟主险联动，豁免险缴费期间和保险期间同主险的缴费期间
       let remitIndex = this.getRemitIndex()
       if (!remitIndex) return
@@ -698,7 +694,12 @@ export default {
             if (factor.code == 'inputPrem') {
               trialInfo['prem'] = Number(this.defalutAmt) * Number(factor.moneyUnit)
             } else {
-              trialInfo['amt'] = Number(this.defalutAmt) * Number(factor.moneyUnit)
+              if (item.isRemit == 0) {
+                trialInfo['amt'] = Number(factor.defaultValue) * Number(factor.moneyUnit)
+              } else {
+                trialInfo['amt'] = Number(this.defalutAmt) * Number(factor.moneyUnit)
+              }
+              // trialInfo['amt'] = Number(this.defalutAmt) * Number(factor.moneyUnit)
             }
           } else if (factor.type == 2) {
             trialInfo.jobLevel = this.saleInsuredPersonInfo[factor.code]
@@ -717,7 +718,8 @@ export default {
             trialInfo.duty = result
           }
         })
-
+        
+        console.log("trialInfo == ",trialInfo)
         //通用规则1：交费方式为一次交情，无交费期限
         if (trialInfo['payIntv'] == '0') {
           trialInfo['payEndYear'] = '1000'