From 49a4683ba43692792534d1d50cbe7bdc39380b00 Mon Sep 17 00:00:00 2001 From: "bai.jinyan" Date: Wed, 25 Aug 2021 19:48:12 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=9B=9E=E6=BB=9A-=E5=8D=A1=E5=8D=95?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=AF=81=E4=BB=B6=E6=88=AA=E6=AD=A2=E6=97=A5?= =?UTF-8?q?=E6=9C=9F--=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E7=99=BD?= =?UTF-8?q?=E9=87=91=E5=B2=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/cardList/information.vue | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/views/ebiz/cardList/information.vue b/src/views/ebiz/cardList/information.vue index b47df0f20..ad7783ec8 100644 --- a/src/views/ebiz/cardList/information.vue +++ b/src/views/ebiz/cardList/information.vue @@ -198,7 +198,6 @@ Date: Wed, 25 Aug 2021 19:54:13 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=8A=95=E4=BF=9D=E4=BA=BA=E8=AF=81?= =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8Blist=E5=8F=96=E5=80=BC=E9=97=AE?= =?UTF-8?q?=E9=A2=98idType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/cardList/information.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ebiz/cardList/information.vue b/src/views/ebiz/cardList/information.vue index ad7783ec8..a302baf95 100644 --- a/src/views/ebiz/cardList/information.vue +++ b/src/views/ebiz/cardList/information.vue @@ -1080,7 +1080,7 @@ export default { if (this.itemProductDTOS.productCode == 'GFRS_M0048' || this.itemProductDTOS.productCode == 'GFRS_M0049' || this.itemProductDTOS.productCode == 'GFRS_M0050' || this.itemProductDTOS.productCode == 'GFRS_M0052') { this.columns = DataDictionary.insuredIdTypeSpecial } else { - this.columns = DataDictionary.insuredIdType + this.columns = DataDictionary.idType } } }, From 10974e9749763d17dce49cf84160a63b9d9f9bad Mon Sep 17 00:00:00 2001 From: "bai.jinyan" Date: Thu, 26 Aug 2021 11:50:47 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=8D=A1=E5=8D=95=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E8=AF=81=E4=BB=B6=E6=88=AA=E6=AD=A2=E6=97=A5=E6=9C=9F=20?= =?UTF-8?q?=E5=8F=8A=20=E7=9B=B8=E5=85=B3=E8=81=94=E5=8A=A8=E5=A4=84?= =?UTF-8?q?=E7=90=86--=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E7=99=BD?= =?UTF-8?q?=E9=87=91=E5=B2=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/cardList/information.vue | 65 +++++++++++++++++++++---- 1 file changed, 55 insertions(+), 10 deletions(-) diff --git a/src/views/ebiz/cardList/information.vue b/src/views/ebiz/cardList/information.vue index a302baf95..1547408c8 100644 --- a/src/views/ebiz/cardList/information.vue +++ b/src/views/ebiz/cardList/information.vue @@ -198,6 +198,7 @@ Date: Thu, 26 Aug 2021 13:54:18 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=AD=A6=E5=B9=B3=E9=99=A9=E9=AB=98?= =?UTF-8?q?=E7=AD=89=E6=95=99=E8=82=B2=E8=A2=AB=E4=BF=9D=E4=BA=BA=E8=AF=81?= =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B=E9=BB=98=E8=AE=A4=E4=B8=BA=E6=88=B7?= =?UTF-8?q?=E5=8F=A3=E6=9C=AC--=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A?= =?UTF-8?q?=E7=99=BD=E9=87=91=E5=B2=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/cardList/information.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/views/ebiz/cardList/information.vue b/src/views/ebiz/cardList/information.vue index 1547408c8..da271eb7e 100644 --- a/src/views/ebiz/cardList/information.vue +++ b/src/views/ebiz/cardList/information.vue @@ -2062,6 +2062,7 @@ export default { this.insuredInfo.homeCity = this.userInfo.homeCity this.insuredInfo.homeArea = this.userInfo.homeArea this.insuredInfo.homeAddress = this.userInfo.homeAddress + // 针对 3款学平险 和 少儿安康产品 被保人证件类型默认为户口本 --2021-08-26 // 2516--三款学平险-- 0048义务教育 0049 幼儿园 0050 高中 // GFRS-2641--被保险人职业：幼儿园版默认学龄前儿童，义务教育、高中/高等教育默认一般学生 @@ -2073,12 +2074,18 @@ export default { this.insuredInfo.marriage = '2' this.insuredInfo.mobile = this.userInfo.mobile this.insuredInfo.email = this.userInfo.email - } else if (this.itemProductDTOS.productCode == 'GFRS_M0049') { this.insuredInfo.idType = '2' this.insuredInfo.effectiveDateType = true this.insuredInfo.certiexpiredate = '9999-01-01' + // 选择户口本时，是否长期默认为是，不可点击，有效止期隐藏 + this.effectiveDateTypeAbleInsured = true + this.isInsuredCertiexpiredate = false + } else if (this.itemProductDTOS.productCode == 'GFRS_M0049') { this.insuredInfo.occupationCode = '2099908' this.insuredInfo.occupationName = '学龄前儿童' + this.insuredInfo.idType = '2' + this.insuredInfo.effectiveDateType = true + this.insuredInfo.certiexpiredate = '9999-01-01' // 选择户口本时，是否长期默认为是，不可点击，有效止期隐藏 this.effectiveDateTypeAbleInsured = true this.isInsuredCertiexpiredate = false From 00c0bd6584eea953c47ffae8ff14c5d33412076a Mon Sep 17 00:00:00 2001 From: "bai.jinyan" Date: Thu, 26 Aug 2021 14:32:48 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=97=B6=EF=BC=8C=E9=BB=98=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B=E5=A4=84=E7=90=86--=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E4=BA=BA=EF=BC=9A=E7=99=BD=E9=87=91=E5=B2=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/cardList/information.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/ebiz/cardList/information.vue b/src/views/ebiz/cardList/information.vue index da271eb7e..f050279ae 100644 --- a/src/views/ebiz/cardList/information.vue +++ b/src/views/ebiz/cardList/information.vue @@ -1396,8 +1396,9 @@ export default { this.effectiveDateTypeAbleInsured = true this.isInsuredCertiexpiredate = false }else{ + // 因为学平险产品 和 少儿卡单 被保人证件类型只有身份证和户口本 所以回显被保人信息时 如果不是身份证和户口本 就隐藏被保人证件类型 if ((this.itemProductDTOS.productCode == 'GFRS_M0048' || this.itemProductDTOS.productCode == 'GFRS_M0049' || this.itemProductDTOS.productCode == 'GFRS_M0050' || this.itemProductDTOS.productCode == 'GFRS_M0052') - && DataDictionary.insuredIdTypeSpecial.indexOf(data.customerIdType) < 0 ) { + && data.customerIdType != 1) { this.insuredInfo.idType = '' this.insuredInfo.certiexpiredate = '' this.insuredInfo.effectiveDateType = false; From d4091d64f696cbed017294177029918a9d693564 Mon Sep 17 00:00:00 2001 From: "bai.jinyan" Date: Thu, 26 Aug 2021 14:48:29 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=97=B6=EF=BC=8C=E8=BA=AB=E4=BB=BD=E8=AF=81?= =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B=E9=95=BF=E6=9C=9F=E5=A4=84=E7=90=86?= =?UTF-8?q?--=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E7=99=BD=E9=87=91?= =?UTF-8?q?=E5=B2=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/cardList/information.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ebiz/cardList/information.vue b/src/views/ebiz/cardList/information.vue index f050279ae..05c1bf089 100644 --- a/src/views/ebiz/cardList/information.vue +++ b/src/views/ebiz/cardList/information.vue @@ -1409,7 +1409,7 @@ export default { this.effectiveDateTypeAbleInsured = false this.isInsuredCertiexpiredate = true if (data.idEffectEndDate == '9999-01-01') { - this.insuredInfo.certiexpiredate = '9999-01-01' + this.insuredInfo.certiexpiredate = '' this.insuredInfo.effectiveDateType = true //是否长期 } else { this.insuredInfo.certiexpiredate = data.idEffectEndDate //证件截止日期 From d4586ceb251564cc15d0be0bd11a455178c7aa56 Mon Sep 17 00:00:00 2001 From: "bai.jinyan" Date: Thu, 26 Aug 2021 16:17:00 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=97=B6=EF=BC=8C=E5=B7=B2=E5=A9=9A=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=8D=E5=B1=95=E7=A4=BA--=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E4=BA=BA=EF=BC=9A=E7=99=BD=E9=87=91=E5=B2=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/cardList/information.vue | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/views/ebiz/cardList/information.vue b/src/views/ebiz/cardList/information.vue index 05c1bf089..fd535d4f7 100644 --- a/src/views/ebiz/cardList/information.vue +++ b/src/views/ebiz/cardList/information.vue @@ -1396,23 +1396,23 @@ export default { this.effectiveDateTypeAbleInsured = true this.isInsuredCertiexpiredate = false }else{ + this.isInsuredCertiexpiredate = true // 因为学平险产品 和 少儿卡单 被保人证件类型只有身份证和户口本 所以回显被保人信息时 如果不是身份证和户口本 就隐藏被保人证件类型 if ((this.itemProductDTOS.productCode == 'GFRS_M0048' || this.itemProductDTOS.productCode == 'GFRS_M0049' || this.itemProductDTOS.productCode == 'GFRS_M0050' || this.itemProductDTOS.productCode == 'GFRS_M0052') && data.customerIdType != 1) { this.insuredInfo.idType = '' this.insuredInfo.certiexpiredate = '' this.insuredInfo.effectiveDateType = false; - this.isInsuredCertiexpiredate = true this.effectiveDateTypeAbleInsured = false }else{ - this.insuredInfo.effectiveDateType = false; - this.effectiveDateTypeAbleInsured = false - this.isInsuredCertiexpiredate = true if (data.idEffectEndDate == '9999-01-01') { this.insuredInfo.certiexpiredate = '' this.insuredInfo.effectiveDateType = true //是否长期 + this.effectiveDateTypeAbleInsured = true } else { this.insuredInfo.certiexpiredate = data.idEffectEndDate //证件截止日期 + this.insuredInfo.effectiveDateType = false; + this.effectiveDateTypeAbleInsured = false } } } @@ -1593,6 +1593,8 @@ export default { } } } + let insuredAge = utilsAge.getAge(this.insuredInfo.birthday, new Date()) + console.log('计算年龄', insuredAge) //如果证件类型是身份证 if (this.insuredInfo.idType == '1') { console.log('证件类型是身份证') @@ -1669,8 +1671,6 @@ export default { } } } - let insuredAge = utilsAge.getAge(this.insuredInfo.birthday, new Date()) - console.log('计算年龄', insuredAge) if (this.itemProductDTOS.productCode === 'GFRS_M0022') { // return // 如果是未成年人 @@ -2009,8 +2009,6 @@ export default { //GFRS-2641--被保险人年龄小于20周岁（不含），婚姻状况默认为未婚； if (age < 20) { this.insuredInfo.marriage = '2' - } else { - this.insuredInfo.marriage = '' } } }