diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index 97e695310..f6399ea58 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -851,8 +851,21 @@ export default {
     },
     //弹框选择
     toSelect(index, index1, columns) {
+      this.columns = []
       ;[this.popupShow, this.productIndex, this.calFactorIndex] = [true, index, index1]
-      this.columns = columns
+      let currentFactor = this.chooseProducts[this.productIndex].calFactorLst
+      let currentEle = currentFactor[this.calFactorIndex]
+      let sex = this.saleInsuredPersonInfo.sex //0男 1女
+      //性别男女，养老保险金领取年龄不一致
+      if (currentEle.code == 'pensionAge') {
+        columns.forEach((item) => {
+          if(item.sex == sex){
+            this.columns.push(item)
+          }
+        })
+      }else{
+        this.columns = columns
+      }
     },
     //取消picker
     onCancel() {
@@ -865,6 +878,7 @@ export default {
       // let productCode = this.chooseProducts[this.productIndex].productCode
       let currentFactor = this.chooseProducts[this.productIndex].calFactorLst
       let currentEle = currentFactor[this.calFactorIndex]
+      // let sex = this.saleInsuredPersonInfo.sex //0男 1女
 
       //特殊设置：如果需要填写的保费/保额校验规则跟缴费期间挂钩，当改变缴费期间时，将输入框的值恢复默认值1
       if (currentEle.code == 'payEndYear' && this.isTrial == '0') {
@@ -1637,11 +1651,11 @@ export default {
                 if(item.productCode == 'GFRS_A0010'){
                   this.chooseProducts.splice(index01, 1)
                 }
-              })  
+              })
               // Dialog.alert({
               //   title: '提示',
               //   message: '当前未投保其他长险附加险，将删除该险种重新选择附加险！'
-              // }).then(() => {            
+              // }).then(() => {
               // })
             }
 
@@ -2284,7 +2298,7 @@ export default {
               this.trialList[index].productCode == 'GFRS_M0024' ||
               this.trialList[index].productCode == 'GFRS_M0040' ||
               this.trialList[index].productCode == 'GFRS_M0044' ||
-              this.trialList[index].productCode == 'GFRS_M0046' ||
+              this.trialList[index].productCode == 'GFRS_M0046'||
               this.trialList[index].productCode == 'GFRS_M0051'
             ) {
               riskItem['dutyLst'] = this.trialInfos[index].duty
@@ -2294,7 +2308,6 @@ export default {
           if (this.trialList[index].trialType == '1' || this.trialList[index].trialType == '2') {
             riskItem['amt'] = this.trialList[index].amt
           }
-          
           //万能型产品保费赋值给保额
           //增加判断是否是从建议书跳转过来了的
           if (localStorage.isFrom != 'proposal') {
@@ -2306,28 +2319,20 @@ export default {
               riskItem['amt'] = this.trialList[index].prem
             }
           }
+
           //豁免险保额处理
           if (item.isRemit == '0') {
             this.trialInfos[index].amt = this.trialList[0].prem
           }
 
-          if (item.productCode == 'GFRS_A0001') {
+          if (item.productCode == 'GFRS_A0001' || item.productCode == 'GFRS_A0007') {
             this.trialInfos[index].amt = this.trialList[0].standPrem
           }
 
-          if (item.productCode == 'GFRS_A0003' ||  item.productCode == 'GFRS_A0007') {
-            // bug--鑫享年年+附加豁免投保人定寿B+附加豁免投保人重疾B，投保单号8186270000016187
-            // ①豁免重疾B的保额应该等于主险的保费，该单的豁免重疾B的保额等于主险的保额不正确。
+          if (item.productCode == 'GFRS_A0003' || item.productCode == 'GFRS_A0009') {
             this.trialInfos[index].amt = this.trialList[index].amt
           }
-          // GFRS_A0009,GFRS_A0010 这两款时，责任保额不相加
-          if(item.productCode == 'GFRS_A0009' || item.productCode == 'GFRS_A0010'){
-            this.trialInfos[index].amt = this.trialList[index].duty[0].amt
-          }
-          // GFRS_A0011-附加两全 属于非豁免险  但附加两全保额=主险年交保费+其他不带豁免责任的长期期交附加险年交保费
-          if (item.productCode == 'GFRS_A0011') {
-            this.trialInfos[index].amt = this.trialList[0].prem
-          }
+
           if (!this.renewalShow(this.mainRiskCode)) {
             for (let prop of item.calFactorLst) {
               if (prop.type === '4') {
@@ -2347,13 +2352,8 @@ export default {
 
       //国富人寿桂企保重大疾病保险产品专写
       this.trialInfos.map((v, i) => {
-        if (
-          v.productCode == 'GFRS_M0024' ||
-          v.productCode == 'GFRS_M0040' ||
-          v.productCode == 'GFRS_M0044' ||
-          v.productCode == 'GFRS_M0046' ||
-          v.productCode == 'GFRS_M0051'
-        ) {
+        if (v.productCode == 'GFRS_M0024' || v.productCode == 'GFRS_M0040' || v.productCode == 'GFRS_M0044'
+                || v.productCode == 'GFRS_M0046'|| v.productCode == 'GFRS_M0051') {
           delete riskDTOLst[i].duty
         }
       })
@@ -2365,7 +2365,7 @@ export default {
         orderDTO: {
           orderInfoDTO: {
             orderNo: this.$CacheUtils.getLocItem('orderNo'),
-            productChannel: this.isCrossChannel
+            productChannel:this.isCrossChannel
           },
           // appntDTO: {},
           insuredDTOs: [insuredDTOItem]
@@ -2374,11 +2374,11 @@ export default {
 
       // 富娃娃&一年定寿交费方式,交费区间固定为月交
       if (this.richChildrenFlag) {
-        let product = params.orderDTO.insuredDTOs[0].riskDTOLst.find((item) => {
+        let product = params.orderDTO.insuredDTOs[0].riskDTOLst.find(item => {
           return item.productCode === 'GFRS_M0015'
         })
         if (product) {
-          let trialProduct = params.orderDTO.insuredDTOs[0].riskDTOLst.find((item) => {
+          let trialProduct = params.orderDTO.insuredDTOs[0].riskDTOLst.find(item => {
             return item.productCode === 'GFRS_A0006'
           })
           if (trialProduct) {
@@ -2394,9 +2394,9 @@ export default {
       if (localStorage.isFrom == 'proposal') {
         // 从建议书进入, 豁免险保费空值特殊处理
         let prdCodes = ['GFRS_A0001', 'GFRS_A0007']
-        params.orderDTO.insuredDTOs[0].riskDTOLst.forEach((item) => {
+        params.orderDTO.insuredDTOs[0].riskDTOLst.forEach(item => {
           if (prdCodes.includes(item.productCode)) {
-            this.trialList.forEach((element) => {
+            this.trialList.forEach(element => {
               if (item.productCode == element.productCode) {
                 item.amt = element.amt
               }
@@ -2412,7 +2412,7 @@ export default {
         //电投
         if (localStorage.isFrom == 'sale') {
           if (resultData.deleteFlag == '0') {
-            localStorage.salePageFlag = '3'
+            localStorage.salePageFlag = '3';
           }
           this.$jump({
             flag: 'goBack',
@@ -2426,11 +2426,11 @@ export default {
               path: '/common/selectedProduct'
             }
           })
-        } else if (localStorage.isFrom == 'proposal') {
+        }else if (localStorage.isFrom == 'proposal'){
           let proposalOrderNo = this.$CacheUtils.getLocItem('orderNo') || ''
           let url = `/common/selectedProduct?proposalOrderNo=${proposalOrderNo}`
           if (resultData.content.id) {
-            this.saleInsuredPersonInfo.insuredId = resultData.content.id
+            this.saleInsuredPersonInfo.insuredId = resultData.content.id;
             this.$CacheUtils.setLocItem('saleInsuredPersonInfo', JSON.stringify(this.saleInsuredPersonInfo))
           }
           this.$jump({
@@ -2512,6 +2512,5 @@ export default {
     width: 7.46667vw;
     height: 7.46667vw;
   }
-
 }
 </style>
diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue
index 9600ec772..2791d19f7 100644
--- a/src/views/ebiz/common/MainRiskList.vue
+++ b/src/views/ebiz/common/MainRiskList.vue
@@ -452,11 +452,15 @@ export default {
                 item[item.code] = factor[item.code]
                 item[item.code + 'Flag'] = factor[item.code + 'Flag']
                 item.hasFlag = '1'
-              } else {
+              }else if(item.code == 'pensionAge'){
+                //养老保险金领取年龄
+                item[item.code] = factor[item.code]
+                item['sex'] = factor.sex
+              }else {
                 item[item.code] = factor[item.code]
               }
             }
-            let itemColumns = { text: factor.showContent, value: factor[item.code], flag: factor[item.code + 'Flag'] }
+            let itemColumns = { text: factor.showContent, value: factor[item.code], flag: factor[item.code + 'Flag'],sex:factor.sex}
             if (factor.medical !== undefined) {
               itemColumns.medical = factor.medical
             }