From e69b470b77c3e1fae1fe1574a6e124fac53e3167 Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Wed, 6 May 2020 13:15:36 +0800
Subject: [PATCH] =?UTF-8?q?[IMP]=E3=80=90=E7=94=B5=E6=8A=95=E3=80=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96-=E8=A2=AB=E4=BF=9D=E4=BA=BA=E8=AF=81?=
 =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B=E4=B8=BA=E5=87=BA=E7=94=9F=E8=AF=81?=
 =?UTF-8?q?=E5=92=8C=E6=88=B7=E5=8F=A3=E6=9C=AC=E6=97=B6=EF=BC=8C=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E4=B8=BA=E9=95=BF=E6=9C=9F=EF=BC=9B=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?-=E6=8A=95=E8=A2=AB=E4=BF=9D=E4=BA=BA=E5=B9=B4=E9=BE=84?=
 =?UTF-8?q?=E5=B0=8F=E4=BA=8E18=E5=91=A8=E5=B2=81=EF=BC=8C=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=B7=A5=E4=BD=9C=E5=8D=95=E4=BD=8D=E4=B8=BA=E2=80=9C?=
 =?UTF-8?q?=E6=97=A0=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/InsuredInfo.vue   |  8 ++++----
 src/views/ebiz/sale/InsuredPerson.vue | 20 +++++++++++++++-----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue
index 1642dbb7c..6364df3c5 100644
--- a/src/views/ebiz/sale/InsuredInfo.vue
+++ b/src/views/ebiz/sale/InsuredInfo.vue
@@ -759,8 +759,8 @@ export default {
             if (this.userInfo.idType == '1') {
               this.effectiveDateTypeAble = !(age > 45)
             }
-            //年龄小于等于16周岁，工作单位默认值为‘无’
-            if (age <= 16) {
+            //年龄18周岁，工作单位默认值为‘无’
+            if (age < 18) {
               this.userInfo.workcompany = this.userInfo.workcompany || '无'
             }
           }
@@ -1294,8 +1294,8 @@ export default {
       this.effectiveDateTypeAble = idToData(val).age <= 45
       this.userInfo.birthday = idToData(val).birthday
       this.userInfo.sex = idToData(val).sex
-      //年龄小于等于16周岁，工作单位默认值为‘无’
-      if (idToData(val).age <= 16) {
+      //年龄小于18周岁，工作单位默认值为‘无’
+      if (idToData(val).age < 18) {
         this.userInfo.workcompany = this.userInfo.workcompany || '无'
       }
       if (idToData(val).age > 45) {
diff --git a/src/views/ebiz/sale/InsuredPerson.vue b/src/views/ebiz/sale/InsuredPerson.vue
index 00ce28cae..b2755bb85 100644
--- a/src/views/ebiz/sale/InsuredPerson.vue
+++ b/src/views/ebiz/sale/InsuredPerson.vue
@@ -82,7 +82,7 @@
         :readonly="isAppnt || idLimit"
       ></FieldDatePicter> -->
       <FieldDatePicter
-        :v-validate="{ required: certiexpiredateRequired }"
+        v-validate="{ required: certiexpiredateRequired }"
         label="证件截止日期"
         name="证件截止日期"
         :required="isRequired"
@@ -807,6 +807,11 @@ export default {
         if (value.id == '1') {
           let age = utilsAge.getAge(this.userInfo.birthday, new Date())
           this.effectiveDateTypeAble = age <= 45
+        } else if (value.id == 2 || value.id == 3) {
+          this.userInfo.effectiveDateType = true
+          // this.effectiveDateTypeAble = true
+          this.userInfo.certiexpiredate = ''
+          this.$refs.certiexpiredate.date = ''
         } else {
           // else if (value.id == 2 || value.id == 3) {
           //   this.effectiveDateTypeAble = true
@@ -993,8 +998,8 @@ export default {
             }
             //长期判断
             let age = utilsAge.getAge(this.userInfo.birthday, new Date())
-            //年龄小于等于16周岁，工作单位默认值为‘无’
-            if (age <= 16) {
+            //年龄小于18周岁，工作单位默认值为‘无’
+            if (age < 18) {
               this.userInfo.workcompany = this.userInfo.workcompany || '无'
             }
             if (this.userInfo.idType == '1') {
@@ -1157,6 +1162,10 @@ export default {
     //下一步
     async nextStep() {
       let valid = await this.$validator.validate()
+      // console.log('valid', valid)
+      // console.log('certiexpiredateRequired', this.certiexpiredateRequired)
+      // console.log('certiexpiredate', this.userInfo.certiexpiredate)
+      // return
       // .then(valid => {
       if (true === valid) {
         // 职业 学龄前儿童 2099908， 离休人员 8000003，家庭主妇 4071203，无业人员 8000001，
@@ -1568,6 +1577,7 @@ export default {
         // this.isRequired = true
         // this.idLimit = false
       }
+      this.$forceUpdate()
     },
     //获取身份证扫描信息
     getIdentityInfo(data) {
@@ -1644,8 +1654,8 @@ export default {
       this.effectiveDateTypeAble = idToData(val).age <= 45
       this.userInfo.birthday = idToData(val).birthday
       this.userInfo.sex = idToData(val).sex
-      //年龄小于等于16周岁，工作单位默认值为‘无’
-      if (idToData(val).age <= 16) {
+      //年龄小于18周岁，工作单位默认值为‘无’
+      if (idToData(val).age < 18) {
         this.userInfo.workcompany = this.userInfo.workcompany || '无'
       }
       if (!from) {