From 03023f8f150c8946d4083cc1980abcbb047787d7 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Fri, 7 Feb 2020 14:45:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[FIX]=E6=98=AF=E5=90=A6=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=BB=AD=E4=BF=9D=E6=8C=89=E9=92=AE=E4=B8=8D=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9AccountInformation.vue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/AccountInformation.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/ebiz/sale/AccountInformation.vue b/src/views/ebiz/sale/AccountInformation.vue index e55eef3dc..d217ddcdf 100644 --- a/src/views/ebiz/sale/AccountInformation.vue +++ b/src/views/ebiz/sale/AccountInformation.vue @@ -42,7 +42,7 @@ /> - +
温馨提示：该账户将用于首期、续期保费缴费 @@ -143,6 +143,8 @@ export default { isAutoPay: '', // 是否显示自动续保 isRenew: '', + //自动续保按钮是否不允许更改 + isForceRenewAble: false, changeCard: localStorage.changeCard } }, From 8144c0647f25962e909d4fc09a975a654fc68624 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Fri, 7 Feb 2020 18:57:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[FIX]=E8=87=AA=E5=8A=A8=E7=BB=AD=E4=BF=9D?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=BB=98=E8=AE=A4=E5=80=BC=E3=80=81=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E7=A6=81=E7=94=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/AddRiskList.vue | 1 + src/views/ebiz/common/CalculatePremium.vue | 1 + src/views/ebiz/common/MainRiskList.vue | 1 + src/views/ebiz/proposal/Exhibition.vue | 3 +++ src/views/ebiz/sale/AccountInformation.vue | 7 +++++-- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/common/AddRiskList.vue b/src/views/ebiz/common/AddRiskList.vue index fb9953529..4d7abdcdd 100644 --- a/src/views/ebiz/common/AddRiskList.vue +++ b/src/views/ebiz/common/AddRiskList.vue @@ -82,6 +82,7 @@ export default { resultData = resultData.trialDTOS[0] localStorage.isAutoPay = localStorage.isAutoPay == '0' ? '0' : resultData.isAutoPay //自动垫交 localStorage.isRenew = localStorage.isRenew == '0' ? '0' : resultData.isRenew //自动续保 + localStorage.isForceRenew = localStorage.isForceRenew == '0' ? '0' : resultData.isForceRenew //自动续保默认是否选中 0-是 1-否 /********start 附加险选择限制 start******/ //豁免险与其他附加险年龄险种 if (resultData.productTrialInfoDTO.isRemit == '0' && resultData.productTrialInfoDTO.remitType == '0') { diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 0bc2f699f..2ae862880 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -788,6 +788,7 @@ export default { console.log('trialInfo == ', trialInfo) //通用规则1：交费方式为一次交情，无交费期限 if (trialInfo['payIntv'] == '0') { + console.log(11111) trialInfo['payEndYear'] = '1000' trialInfo['payEndYearFlag'] = 'Y' // 福宝宝和万能险传A diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue index 86b02f2c1..c20e35b6e 100644 --- a/src/views/ebiz/common/MainRiskList.vue +++ b/src/views/ebiz/common/MainRiskList.vue @@ -136,6 +136,7 @@ export default { localStorage.addtionRiskLst = JSON.stringify(resultData.productTrialInfoDTO.addtionRiskLst) localStorage.isAutoPay = resultData.isAutoPay localStorage.isRenew = resultData.isRenew + localStorage.isForceRenew = resultData.isForceRenew localStorage.isRelated = resultData.isRelated let calFactorLst = this.getFactorList(resultData) let productTrialYearDTOS = resultData.productTrialInfoDTO.productTrialYearDTOS != null ? resultData.productTrialInfoDTO.productTrialYearDTOS : null diff --git a/src/views/ebiz/proposal/Exhibition.vue b/src/views/ebiz/proposal/Exhibition.vue index f8a2e7f1a..9cf7a1370 100644 --- a/src/views/ebiz/proposal/Exhibition.vue +++ b/src/views/ebiz/proposal/Exhibition.vue @@ -411,12 +411,15 @@ export default { } if (risk.payEndYearFlag == 'Y') { + console.log(111) if (risk.payEndYear == '1000') { risk.payName = '一次交清' } else { + console.log(222) risk.payName = risk.payEndYear + '年' } } else { + console.log(333) risk.payName = risk.payEndYear + '岁' } // risk.demoValue[demoLabel.content] == dutyLst.dutyCode diff --git a/src/views/ebiz/sale/AccountInformation.vue b/src/views/ebiz/sale/AccountInformation.vue index d217ddcdf..bd166e78c 100644 --- a/src/views/ebiz/sale/AccountInformation.vue +++ b/src/views/ebiz/sale/AccountInformation.vue @@ -42,7 +42,7 @@ /> - +
温馨提示：该账户将用于首期、续期保费缴费 @@ -144,7 +144,7 @@ export default { // 是否显示自动续保 isRenew: '', //自动续保按钮是否不允许更改 - isForceRenewAble: false, + isForceRenew: false, changeCard: localStorage.changeCard } }, @@ -410,6 +410,9 @@ export default { this.isAutoPay = localStorage.isAutoPay // 是否显示自动续保 this.isRenew = localStorage.isRenew + //自动续保按钮是否禁用 + this.isForceRenew = localStorage.isForceRenew == '0' ? true : false + this.isChecked = localStorage.isForceRenew == '0' ? true : false }, mounted() { document.body.style.backgroundColor = '#F5F5F5' From 462a7ed54efc54741f3c321140e8aec3cab4f5c6 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Fri, 7 Feb 2020 19:54:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[FIX]=E7=90=86=E8=B5=94=E7=94=B3=E8=AF=B7-?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BF=A1=E6=81=AF-=E8=AF=81=E4=BB=B6?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=97=A0=E6=B3=95=E5=B8=A6=E5=87=BAbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/claims/ApplyInfo.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/claims/ApplyInfo.vue b/src/views/ebiz/claims/ApplyInfo.vue index 6a6b87e7b..1b504c100 100644 --- a/src/views/ebiz/claims/ApplyInfo.vue +++ b/src/views/ebiz/claims/ApplyInfo.vue @@ -912,11 +912,11 @@ export default { this.certiexpiredateRequired = false this.userInfo.certiIsLong = '1' } else { - this.userInfo.applyerCertiEndDate = '' + // this.userInfo.applyerCertiEndDate = '' this.certiexpiredateRequired = true this.userInfo.certiIsLong = '0' } - effectiveDataTypeChange(this, val) + // effectiveDataTypeChange(this, val) }, chooseOccupation() { this.occupationShowPicker = false