From 1a61367991e58dc3d72a6eb598f3c1caf135b63f Mon Sep 17 00:00:00 2001 From: xuxingjun Date: Fri, 13 Dec 2024 14:30:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=9B=BD=E5=AF=8C?= =?UTF-8?q?=E4=BA=BA=E5=AF=BF=E9=91=AB=E7=AE=A1=E5=AE=B6C=E6=AC=BE?= =?UTF-8?q?=E7=BB=88=E8=BA=AB=E5=AF=BF=E9=99=A9=EF=BC=88=E4=B8=87=E8=83=BD?= =?UTF-8?q?=E5=9E=8B=EF=BC=89=E4=BA=A7=E5=93=81=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 15 +++++++-------- src/views/ebiz/common/MainRiskList.vue | 11 ++++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 0da9b20b6..9dcf7d9c8 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -37,7 +37,7 @@ :show-plus="false" :show-minus="false" class="ml30" - :disabled="item.productCode == 'GFRS_M0083' && isFrom != 'proposal'" + :disabled="item.productCode == 'GFRS_M0083' || item.productCode == 'GFRS_M0098' && isFrom != 'proposal'" @change=" stepperChange( item.calFactorLst[riskFactorIndex].displayAmount, @@ -180,7 +180,7 @@
- +
@@ -348,7 +348,7 @@
@@ -831,7 +831,7 @@ export default { this.isEnterAddtionRiskListFunc() } } - if ((item.mainRiskCode == 'GFRS_M0083' || item.mainRiskCode == 'GFRS_M0085') && this.isFrom == 'proposal') { + if ((item.mainRiskCode == 'GFRS_M0083' || item.mainRiskCode == 'GFRS_M0098' || item.mainRiskCode == 'GFRS_M0085') && this.isFrom == 'proposal') { item.calFactorLst.forEach((i) => { if (i.code == 'inputPrem') { i.minPrem = 0.01 @@ -1106,7 +1106,6 @@ export default { // let productCode = this.chooseProducts[this.productIndex].productCode let currentFactor = this.chooseProducts[this.productIndex].calFactorLst let currentEle = currentFactor[this.calFactorIndex] - console.log(currentEle.code) if (currentEle.code == 'insuYear') { if (value.value == '70') { this.chooseProducts.forEach((item, index) => { @@ -2156,13 +2155,13 @@ export default { let thisproductInfo = JSON.parse(window.localStorage.getItem('chooseProducts')) if (thisproductInfo && thisproductInfo.length != 0) { thisproductInfo.forEach((item) => { - if (item.productCode == 'GFRS_M0083' || item.productCode == 'GFRS_M0085') { + if (item.productCode == 'GFRS_M0083' || item.productCode == 'GFRS_M0098' || item.productCode == 'GFRS_M0085') { productCode = item.productCode } }) } if (this.isFrom != 'proposal') { - if (productCode == 'GFRS_M0083' || productCode == 'GFRS_M0085') { + if (productCode == 'GFRS_M0083' || productCode == 'GFRS_M0098' || productCode == 'GFRS_M0085') { if (!that.policyNo) { that.chooseProducts.forEach((item) => { item.calFactorLst.forEach((ii) => { @@ -2935,7 +2934,7 @@ export default { } } } - } else if (productCode == 'GFRS_M0083' || productCode == 'GFRS_M0085') { + } else if (productCode == 'GFRS_M0083' || productCode == 'GFRS_M0098' || productCode == 'GFRS_M0085') { if (this.isFrom != 'proposal') { if (!this.policyNo && defalutValue < 5) { this.$toast('单独投保，保费为大于等于50000元') diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue index 068f382cc..e8dcf044c 100644 --- a/src/views/ebiz/common/MainRiskList.vue +++ b/src/views/ebiz/common/MainRiskList.vue @@ -197,7 +197,7 @@ export default { // ------------------------专为惠企写死--end---------------// //如果是选择产品, 进入电子投保, 在主险列表能默认选中我在产品列表选择的产品 if (this.list.length > 0) { - console.log(localStorage.productCodeChooseFromList) + // console.log(localStorage.productCodeChooseFromList) this.result = this.list.find((v) => { return v.riskProductCode == localStorage.productCodeChooseFromList }) @@ -274,7 +274,7 @@ export default { // ------------------------专为惠企写死--end---------------// // 如果是选择产品, 进入电子投保, 在主险列表能默认选中我在产品列表选择的产品 if (this.list.length > 0) { - console.log(localStorage.productCodeChooseFromList) + // console.log(localStorage.productCodeChooseFromList) this.result = this.list.find((v) => { return v.riskProductCode == localStorage.productCodeChooseFromList }) @@ -440,7 +440,6 @@ export default { return this.$toast('该投保人工作单位不能投保该产品') } /********end 主险选择限制 end******/ - //保存附加险 localStorage.addtionRiskLst = JSON.stringify(resultData.productTrialInfoDTO.addtionRiskLst) localStorage.isAutoPay = resultData.isAutoPay @@ -449,6 +448,8 @@ export default { localStorage.isRelated = resultData.isRelated let calFactorLst = this.getFactorList(resultData) + + // return let productTrialYearDTOS = resultData.productTrialInfoDTO.productTrialYearDTOS != null ? resultData.productTrialInfoDTO.productTrialYearDTOS : null let hasAddtionRisk = resultData.productTrialInfoDTO.addtionRiskLst != null && resultData.productTrialInfoDTO.addtionRiskLst.length ? true : false let currentProductInfo = @@ -504,9 +505,9 @@ export default { //构建险种因子列表 getFactorList(resultData) { let productTrialInfoDTO = resultData.productTrialInfoDTO - console.log(productTrialInfoDTO, 'wode') + // console.log(productTrialInfoDTO, 'wode') let calFactorLst = resultData.productTrialInfoDTO.calFactorLst - console.log('calFactorLst', calFactorLst) + // console.log('calFactorLst', calFactorLst) calFactorLst.forEach((item) => { item['isMainRisk'] = 0 From 8ed05e2e1ad8044f98a2ae1ee6cc9853eda255c8 Mon Sep 17 00:00:00 2001 From: xuxingjun Date: Fri, 13 Dec 2024 15:54:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E5=85=B3=E8=81=94=E4=BF=9D=E5=8D=95=E4=B8=8E=E4=BF=9D=E8=B4=B9?= =?UTF-8?q?=E7=9A=84=E5=BD=95=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 9dcf7d9c8..51c272d4a 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -37,7 +37,7 @@ :show-plus="false" :show-minus="false" class="ml30" - :disabled="item.productCode == 'GFRS_M0083' || item.productCode == 'GFRS_M0098' && isFrom != 'proposal'" + :disable-input="disabledShow" @change=" stepperChange( item.calFactorLst[riskFactorIndex].displayAmount, @@ -574,6 +574,7 @@ export default { cvalidateFlag: false, cvalidateStr: '', //活动生效日 chooseProducts: [], + disabledShow: false, productIndex: '', calFactorIndex: '', premiumData: [], //试算 @@ -831,6 +832,9 @@ export default { this.isEnterAddtionRiskListFunc() } } + if (item.mainRiskCode == 'GFRS_M0083' || item.mainRiskCode == 'GFRS_M0098' || item.mainRiskCode == 'GFRS_M0085') { + this.disabledShow = true + } if ((item.mainRiskCode == 'GFRS_M0083' || item.mainRiskCode == 'GFRS_M0098' || item.mainRiskCode == 'GFRS_M0085') && this.isFrom == 'proposal') { item.calFactorLst.forEach((i) => { if (i.code == 'inputPrem') { @@ -2163,6 +2167,7 @@ export default { if (this.isFrom != 'proposal') { if (productCode == 'GFRS_M0083' || productCode == 'GFRS_M0098' || productCode == 'GFRS_M0085') { if (!that.policyNo) { + this.disabledShow = true that.chooseProducts.forEach((item) => { item.calFactorLst.forEach((ii) => { if (ii.type == 1) { @@ -2172,6 +2177,7 @@ export default { }) }) } else { + this.disabledShow = false that.chooseProducts.forEach((item) => { item.calFactorLst.forEach((ii) => { if (ii.type == 1) { From a6685c2360c8d11e9f5fedb27a0d3f60af998e80 Mon Sep 17 00:00:00 2001 From: xuxingjun Date: Thu, 19 Dec 2024 13:43:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BB=BA=E8=AE=AE?= =?UTF-8?q?=E4=B9=A6=E7=9A=84=E4=BF=9D=E8=B4=B9=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 51c272d4a..f86ea80bf 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -835,6 +835,10 @@ export default { if (item.mainRiskCode == 'GFRS_M0083' || item.mainRiskCode == 'GFRS_M0098' || item.mainRiskCode == 'GFRS_M0085') { this.disabledShow = true } + if(item.hasPredictTransferPrem == '1') { + this.disabledShow = false + } + if ((item.mainRiskCode == 'GFRS_M0083' || item.mainRiskCode == 'GFRS_M0098' || item.mainRiskCode == 'GFRS_M0085') && this.isFrom == 'proposal') { item.calFactorLst.forEach((i) => { if (i.code == 'inputPrem') { @@ -2156,11 +2160,13 @@ export default { async getTrial() { let that = this let productCode = '' + let hasPredictTransferPrem = '' let thisproductInfo = JSON.parse(window.localStorage.getItem('chooseProducts')) if (thisproductInfo && thisproductInfo.length != 0) { thisproductInfo.forEach((item) => { if (item.productCode == 'GFRS_M0083' || item.productCode == 'GFRS_M0098' || item.productCode == 'GFRS_M0085') { productCode = item.productCode + hasPredictTransferPrem = item.hasPredictTransferPrem } }) } @@ -2189,6 +2195,9 @@ export default { } } } + if(hasPredictTransferPrem == '1') { + this.disabledShow = false + } this.nextStepFlag = true this.$toast.clear() this.$toast.loading({ From 67f13e6d794207d624fb26c6bca3272fb0b2661b Mon Sep 17 00:00:00 2001 From: "zhang.lei3" Date: Tue, 24 Dec 2024 09:48:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=91=AB=E7=AE=A1=E5=AE=B6c=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=BB=BA=E8=AE=AE=E4=B9=A6=E9=A2=84=E8=A7=88=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=9D=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/proposal/ProposalInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ebiz/proposal/ProposalInfo.vue b/src/views/ebiz/proposal/ProposalInfo.vue index 4a4433b14..216fcba85 100644 --- a/src/views/ebiz/proposal/ProposalInfo.vue +++ b/src/views/ebiz/proposal/ProposalInfo.vue @@ -795,7 +795,7 @@ export default { that.pageShowInfo.insuredDTOs.forEach((item) => { item.riskDTOLst.forEach((item01) => { if (item01.isMainRisk == '0') { - if (item01.mainRiskCode == 'GFRS_M0080' || item01.mainRiskCode == 'GFRS_M0083' || item01.mainRiskCode == 'GFRS_M0085') { + if (item01.mainRiskCode == 'GFRS_M0080' || item01.mainRiskCode == 'GFRS_M0083' || item01.mainRiskCode == 'GFRS_M0085' || item01.mainRiskCode == 'GFRS_M0098') { that.ispremshow = false } mainRiskNameList.push(item01.riskName)