From a6431274cbe3541e5f411de2302f6ec45e3d52be Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Wed, 1 Apr 2020 09:46:05 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E6=9A=82=E6=97=B6?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=20=E5=9B=BD=E5=AF=8C=E6=A0=8B=E6=A2=81?=
 =?UTF-8?q?=E5=AE=9A=E6=9C=9F=E5=AF=BF=E9=99=A9=20=E7=9A=84=E4=BA=A4?=
 =?UTF-8?q?=E8=B4=B9=E6=9C=9F=E9=97=B4=E3=80=81=E4=BF=9D=E9=99=A9=E6=9C=9F?=
 =?UTF-8?q?=E9=97=B4=E7=9A=84=E8=81=94=E5=8A=A8=E5=85=B3=E7=B3=BB=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E4=BB=8E=E5=90=8E=E5=8F=B0=E8=8E=B7=E5=8F=96=E3=80=82?=
 =?UTF-8?q?=20=E5=BE=85=E6=B5=8B=E8=AF=95=E9=85=8D=E7=BD=AE=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/common/CalculatePremium.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index f44f4bfe5..cb453e196 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -500,23 +500,24 @@ export default {
             //   'if(ParKey == "payEndYear"){',
             //   '  payEndYear = Par.value + Par.flag;',
             //   '  lintAgeObj = ageMap[payEndYear];',
-            //   '  let flag = true;',
+            //   '  let flag = true, num = parObj.insuYear.columns.length;',
             //   '  parObj.insuYear.columns.forEach(item => {',
             //   '    let lintAge = lintAgeObj[ item.value + item.flag ];',
             //   '    if( age > lintAge ){',
             //   '      item.disabled = true;',
+            //   '      num = num - 1 ;',
+            //   '    }else{',
             //   '      if(flag){',
             //   '        parObj.insuYear.insuYear = item.value;',
             //   '        parObj.insuYear.insuYearFlag = item.flag;',
             //   '        parObj.insuYear.showContent = item.text;',
             //   '        flag = false;',
             //   '      };',
-            //   '    }else{',
             //   '      item.disabled = false;',
             //   '    };',
             //   '  });',
-            //   '  if(!flag){',
-            //   '    this.errorMsg.push("您当前选择的交费期间下，无可搭配的保险期间。");',
+            //   '  if(!num){',
+            //   '    this.errorMsg.push("被保险人年龄不符合当前所选交费期间");',
             //   '    payEndYear = parObj.payEndYear.payEndYear + parObj.payEndYear.payEndYearFlag;',
             //   '    lintAgeObj = ageMap[payEndYear];',
             //   '    parObj.insuYear.columns.forEach(item => {',
@@ -708,7 +709,8 @@ export default {
             this.$emit(item,currentFactor,currentEle.code,value);
           })
           if(this.errorMsg.length > 0){
-            //this.$toast(this.errorMsg[0]);
+            this.$toast(this.errorMsg[0]);
+            this.errorMsg = []
             this.popupShow = false
             return false
           }