From c6efca900b194f0a32b0dc0cb5d21adbb376b2a1 Mon Sep 17 00:00:00 2001
From: "li.yuetong" <li.yuetong@ebiz-digits.com>
Date: Fri, 29 Jul 2022 17:21:25 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=AD=E4=BB=8B=E6=B8=A0=E9=81=93?=
 =?UTF-8?q?=E9=91=AB=E4=BA=AB=E5=B9=B4=E5=B9=B4=E7=BB=88=E8=BA=AB=E5=AF=BF?=
 =?UTF-8?q?=E9=99=A9=EF=BC=88B=E6=AC=BE=EF=BC=89=E3=80=9165=E5=B2=81?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E9=80=89=E6=8B=A9=E9=95=BF=E6=9C=9F=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=97=B6=EF=BC=8C=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?46=E5=91=A8=E5=B2=81~65=E5=91=A8=E5=B2=81=E7=9A=84=E8=AF=81?=
 =?UTF-8?q?=E4=BB=B6=E6=9C=89=E6=95=88=E6=9C=9F=E4=B8=BA20=E5=B9=B4?=
 =?UTF-8?q?=E6=88=96=E9=95=BF=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/InsuredInfo.vue   | 6 +++---
 src/views/ebiz/sale/InsuredPerson.vue | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue
index b4b978a9a..d42bfcf15 100644
--- a/src/views/ebiz/sale/InsuredInfo.vue
+++ b/src/views/ebiz/sale/InsuredInfo.vue
@@ -919,7 +919,7 @@ export default {
                 }
                 //年龄在46-65周岁之间
               } else if (age >= 46 && age <= 65) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 || this.effectiveDateType == false) {
+                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && this.userInfo.effectiveDateType == false) {
                   this.userInfo.certiexpiredate = ''
                   this.$refs.certiexpiredate.date = ''
                   return this.$toast('46周岁~65周岁的证件有效期为20年或长期')
@@ -1108,7 +1108,7 @@ export default {
 
           //身份证证件类型的判断
           //证件止期
-          let val = this.userInfo.certiexpiredate
+          let val = this.userInfo.certiexpiredate 
           //年龄在16周岁以下
           if (age < 16) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
@@ -1146,7 +1146,7 @@ export default {
             }
             //年龄在46-65周岁之间
           } else if (age >= 46 && age <= 65) {
-            if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 || this.effectiveDateType == false) {
+            if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && this.userInfo.effectiveDateType == false) {
               this.userInfo.certiexpiredate = ''
               this.$refs.certiexpiredate.date = ''
               return this.$toast('46周岁~65周岁的证件有效期为20年或长期')
diff --git a/src/views/ebiz/sale/InsuredPerson.vue b/src/views/ebiz/sale/InsuredPerson.vue
index 121419b02..16c8fbc74 100644
--- a/src/views/ebiz/sale/InsuredPerson.vue
+++ b/src/views/ebiz/sale/InsuredPerson.vue
@@ -1123,7 +1123,7 @@ export default {
                 }
                 //年龄在46-65周岁之间
               } else if (age >= 46 && age <= 65) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 || this.effectiveDateType == false) {
+                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && this.userInfo.effectiveDateType == false) {
                   this.userInfo.certiexpiredate = ''
                   this.$refs.certiexpiredate.date = ''
                   return this.$toast('46周岁~65周岁的证件有效期为20年或长期')
@@ -1503,7 +1503,7 @@ export default {
             }
             //年龄在46-65周岁之间
           } else if (age >= 46 && age <= 65) {
-            if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 || this.effectiveDateType == false) {
+            if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 || this.userInfo.effectiveDateType == false) {
               this.userInfo.certiexpiredate = ''
               this.$refs.certiexpiredate.date = ''
               return this.$toast('46周岁~65周岁的证件有效期为20年或长期')