From e0f3a6b19cf5d4ea02d32b9ed3816f64a8dc46b7 Mon Sep 17 00:00:00 2001 From: liyuetong Date: Tue, 18 Jan 2022 15:44:24 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=B3=E4=BA=8E=E4=B8=AA=E9=99=A9?= =?UTF-8?q?=E6=B8=A0=E9=81=93=E5=8D=8F=E5=90=8C=E4=BA=A7=E5=93=81=E4=B8=93?= =?UTF-8?q?=E5=8C=BA=E7=B3=BB=E7=BB=9F=E5=BC=80=E5=8F=91=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E7=9A=84=E7=94=B3=E8=AF=B7=E3=80=91=E6=98=AF=E5=90=A6=E4=B8=BA?= =?UTF-8?q?=E5=8D=8F=E5=90=8C=E5=8D=95=E4=BD=8D=E4=B8=BA=E6=98=AF=E5=B9=B6?= =?UTF-8?q?=E4=B8=94=E5=8D=8F=E5=90=8C=E5=8D=95=E4=BD=8D=E5=8F=AF=E6=9F=A5?= =?UTF-8?q?=EF=BC=8C=E6=89=8D=E5=8F=AF=E9=80=89=E4=B8=BB=E9=99=A9=E4=B8=BA?= =?UTF-8?q?=E5=98=89=E5=92=8C=E4=BF=9D=EF=BC=8C=E6=A1=82=E4=BC=81=E4=BF=9D?= =?UTF-8?q?=EF=BC=8C=E7=91=9E=E5=88=A9=E5=B9=B4=E9=87=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/business-common.js | 3 ++- src/views/ebiz/common/MainRiskList.vue | 3 +-- src/views/ebiz/common/SelectedProduct.vue | 9 ++++++++- src/views/ebiz/common/risk-rules.js | 6 ++++-- src/views/ebiz/proposal/ProposalInfo.vue | 7 ++++--- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/assets/js/business-common.js b/src/assets/js/business-common.js index 8473406e2..5b6a8933b 100644 --- a/src/assets/js/business-common.js +++ b/src/assets/js/business-common.js @@ -552,7 +552,8 @@ export default { // marriage: appntDTO.marriage, medical: appntDTO.medical, certiexpiredate: appntDTO.certiexpiredate, - nativeplace: appntDTO.nativeplace + nativeplace: appntDTO.nativeplace, + isAsync: appntDTO.isAsync }) ) diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue index b7b3839f4..f3e4cac62 100644 --- a/src/views/ebiz/common/MainRiskList.vue +++ b/src/views/ebiz/common/MainRiskList.vue @@ -380,8 +380,7 @@ export default { //校验该代理人是否有该产品的售卖权限 return this.$toast('抱歉，您没有该产品的销售权限！') } - - let flagCompany = await riskRules.checkCompany(resultData.productCode, JSON.parse(this.$CacheUtils.getLocItem('saleInsuredInfo')).workcompany, this) + let flagCompany = await riskRules.checkCompany(resultData.productCode, JSON.parse(this.$CacheUtils.getLocItem('saleInsuredInfo')).workcompany, JSON.parse(this.$CacheUtils.getLocItem('saleInsuredInfo')).isAsync,this) if (flagCompany && localStorage.isFrom != 'proposal') { //校验该投保人的工作单位是否能够投保该产品 return this.$toast('该投保人工作单位不能投保该产品') diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue index c6c2ac72e..dd6f5c5b0 100644 --- a/src/views/ebiz/common/SelectedProduct.vue +++ b/src/views/ebiz/common/SelectedProduct.vue @@ -125,6 +125,7 @@ import { getDetail, deleteProposal } from '@/api/ebiz/proposal/proposal.js' import { saveOrderActiveType,getActivityList } from '@/api/ebiz/sale/sale.js' import utilsAge from '@/assets/js/utils/age' import IndexBar from '@/components/ebiz/sale/IndexBar' +import riskRules from './risk-rules' export default { name: 'selectedProduct', @@ -370,7 +371,7 @@ export default { } }, //下一步 - nextStep() { + async nextStep() { if (!this.$route.query.salePageFlag) { //如果从保单列表编辑按钮进入 localStorage.salePageFlag = '4' @@ -379,6 +380,12 @@ export default { if (this.chooseProducts.length == 0) { return this.$toast('请添加产品') } + //重新校验该产品是否需要为协同单位 + let flagCompany = await riskRules.checkCompany(this.chooseProducts[0].riskCode, JSON.parse(this.$CacheUtils.getLocItem('saleInsuredInfo')).workcompany, JSON.parse(this.$CacheUtils.getLocItem('saleInsuredInfo')).isAsync,this) + if (flagCompany && localStorage.isFrom != 'proposal') { + //校验该投保人的工作单位是否能够投保该产品 + return this.$toast('该投保人工作单位不能投保该产品') + } //930折中方案，豁免险选择 let oldAddRiskCodes = JSON.parse(localStorage.oldAddRiskCodes) if (oldAddRiskCodes.includes('DCRS_A0001')) { diff --git a/src/views/ebiz/common/risk-rules.js b/src/views/ebiz/common/risk-rules.js index 726b41fc9..83914af00 100644 --- a/src/views/ebiz/common/risk-rules.js +++ b/src/views/ebiz/common/risk-rules.js @@ -141,7 +141,8 @@ export default { }) }, //校验投保人工作单位是否有权限投保该产品 - checkCompany(val, workcompany, that) { + //isAsync 是否协同工作单位 0否 1是 + checkCompany(val, workcompany,isAsync, that) { let flag = true let columns = [] return new Promise((resolve, reject) => { @@ -152,7 +153,8 @@ export default { if (columns.length == 0) { flag = false } else { - flag = !columns.includes(workcompany) + //是否为协同单位为是并且协同单位可查，才可选主险为嘉和保，桂企保，瑞利年金 + flag = !(columns.includes(workcompany) && isAsync == 1) } } else { that.$toast(res.resultMessage) diff --git a/src/views/ebiz/proposal/ProposalInfo.vue b/src/views/ebiz/proposal/ProposalInfo.vue index 057ca348d..ecc312525 100644 --- a/src/views/ebiz/proposal/ProposalInfo.vue +++ b/src/views/ebiz/proposal/ProposalInfo.vue @@ -780,9 +780,10 @@ export default { // 选择年龄 checkAgeForRate(index) { let risk = this.pageShowInfo.showInsuredDTO - if (risk.sliderValue == risk.policyYear) { - return - } + // 建议书选择106，这两个值相等时，就不能再选择其他年龄了,先去掉 + // if (risk.sliderValue == risk.policyYear) { + // return + // } risk.sliderValue = index this.$forceUpdate() this.slideChange(risk)