diff --git a/src/router/ebiz/proposal.js b/src/router/ebiz/proposal.js
index 5377f7790..444331f1f 100644
--- a/src/router/ebiz/proposal.js
+++ b/src/router/ebiz/proposal.js
@@ -31,7 +31,7 @@ export default [
name: 'ChooseInsuredPerson',
component: chooseInsuredPerson,
meta: {
- title: '选择被保险人'
+ title: '选择被保人'
}
},
{
@@ -49,7 +49,7 @@ export default [
name: 'InsuredPerson',
component: insuredPerson,
meta: {
- title: '被保险人信息',
+ title: '被保人信息',
index: 1
}
},
diff --git a/src/router/ebiz/sale.js b/src/router/ebiz/sale.js
index 0ef64aaea..f914be21c 100644
--- a/src/router/ebiz/sale.js
+++ b/src/router/ebiz/sale.js
@@ -59,7 +59,7 @@ export default [
name: 'insuredPerson',
component: insuredPerson,
meta: {
- title: '被保险人信息',
+ title: '被保人信息',
index: 1
}
},
diff --git a/src/views/ebiz/agentEenter/js/methods.js b/src/views/ebiz/agentEenter/js/methods.js
index 442d5a74b..a067b331b 100644
--- a/src/views/ebiz/agentEenter/js/methods.js
+++ b/src/views/ebiz/agentEenter/js/methods.js
@@ -93,7 +93,7 @@ export function appCallBack(that, type) {
title = '投保人信息'
break
case '2':
- title = '被保险人信息'
+ title = '被保人信息'
break
case '3':
title = '指定受益人信息'
@@ -129,7 +129,7 @@ export function chooseOccupation(that, type) {
title = '投保人信息'
break
case '2':
- title = '被保险人信息'
+ title = '被保人信息'
break
case '3':
title = '指定受益人信息'
@@ -514,7 +514,7 @@ export function chooseCustomer(that, data, type) {
title = '投保人信息'
break
case '2':
- title = '被保险人信息'
+ title = '被保人信息'
break
case '3':
title = '指定受益人信息'
@@ -829,7 +829,7 @@ export function getIdentityInfo(that, data, type) {
}
that.isScan = false
that.bankisScan = false
- let title = type == '1' ? '投保人信息' : '被保险人信息'
+ let title = type == '1' ? '投保人信息' : '被保人信息'
that.$jump({
flag: 'navigation',
extra: {
diff --git a/src/views/ebiz/common/AddRiskList.vue b/src/views/ebiz/common/AddRiskList.vue
index 185b3ff04..4fe77efbd 100644
--- a/src/views/ebiz/common/AddRiskList.vue
+++ b/src/views/ebiz/common/AddRiskList.vue
@@ -122,7 +122,6 @@ export default {
let currentProductInfo = {
calFactorLst,
isMainRisk: 1,
- hint: resultData.hint,
riskType: resultData.riskType,
riskName: this.result.riskName,
productCode: this.result.productCode,
diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index 910950687..c293328a6 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -163,7 +163,7 @@
:show-minus="false"
class="ml10 mr10"
@focus="focusStep"
- @blur="blurStep(dutyItem, index, riskFactorIndex, dutyItemIndex)"
+ @blur="blurStep(dutyItem)"
@change="
dutyStepperChange(
item.calFactorLst[riskFactorIndex].rules[dutyItemIndex].defaultDutyAmt,
@@ -412,44 +412,20 @@ export default {
})
//GFRS_M0016需要展示免赔额和赔付比例,并需要根据是否有社保调整数值
// let mainRiskCode = chooseProducts[0].mainRiskCode
- this.dogetLimitAndGetRate().then(res => {
- if (this.chooseProducts[0].influences && this.chooseProducts[0].influences.length > 0) {
- this.influences = this.chooseProducts[0].influences
- this.chooseProducts[0].influences.forEach(item => {
- this.influenceAddRiskCodes.push(item.productCode)
- })
- }
- this.mainRiskInfluenceAddRisk()
- //初始化数据试算
- this.getTrial()
- })
- },
- //特殊处理 GFRS_M0016 GFRS_A0004 GFRS_A0005 赔付比例处理
- async dogetLimitAndGetRate() {
- const orderNo = localStorage.getItem('orderNo')
- let detailPromise = this.isFrom === 'proposal' ? new Promise(r => r(localStorage.getItem('proposalMedical'))) : await getOrderDetail({ orderNo })
this.chooseProducts.map(item => {
- if (!(item.mainRiskCode === 'GFRS_M0016' || item.productCode === 'GFRS_A0004' || item.productCode === 'GFRS_A0005')) {
- //其他产品删掉两个字段
- let calFactorLst = item.calFactorLst
- for (let i = calFactorLst.length - 1; i >= 0; i--) {
- let item = calFactorLst[i]
- if (item.code === 'getLimit' || item.code === 'getRate') {
- calFactorLst.splice(i, 1)
+ if (item.mainRiskCode === 'GFRS_M0016') {
+ const orderNo = localStorage.getItem('orderNo')
+ let detailPromise = this.isFrom === 'proposal' ? new Promise(r => r(localStorage.getItem('proposalMedical'))) : getOrderDetail({ orderNo })
+ detailPromise.then(res => {
+ let isMedical = null
+ if (this.isFrom === 'proposal') {
+ isMedical = res === '1'
+ } else {
+ isMedical = res.orderDTO.insuredDTOs[0].medical === '0'
}
- }
- return
- }
- if (item.mainRiskCode === 'GFRS_M0016' || item.productCode === 'GFRS_A0004') {
- let isMedical = null
- if (this.isFrom === 'proposal') {
- isMedical = detailPromise === '1'
- } else {
- isMedical = detailPromise.orderDTO.insuredDTOs[0].medical === '0'
- }
- //根据社保写死两个字段 赔付比例和免赔额
- item.calFactorLst.map(i => {
- if (item.mainRiskCode === 'GFRS_M0016') {
+ //根据社保写死两个字段 赔付比例和免赔额
+ item.calFactorLst.map(i => {
+ //免赔额
if (i.code === 'getLimit') {
const text = isMedical ? '0元(意外医疗)' : '100元(意外医疗)'
const value = isMedical ? '0' : '100'
@@ -475,46 +451,37 @@ export default {
i.getRate = value
i.columns = [{ text, value }]
}
- } else if (item.productCode === 'GFRS_A0004') {
- if (i.code === 'getLimit') {
- const text2 = isMedical ? '0元(住院医疗)' : '100元(住院医疗)'
- const value2 = isMedical ? '0' : '100'
-
- //保存数据
- this.medicalInfo = this.medicalInfo || {}
- this.medicalInfo.getLimit = text2
-
- i.showContent = text2
- i.getLimit = value2
- i.columns = [{ text2, value2 }]
- }
- //赔付比例
- if (i.code === 'getRate') {
- const text = isMedical ? '80%(住院医疗)' : '60%(住院医疗)'
- const value = isMedical ? '0.8' : '0.6'
-
- //保存数据
- this.medicalInfo = this.medicalInfo || {}
- this.medicalInfo.getRate = text
-
- i.showContent = text
- i.getRate = value
- i.columns = [{ text, value }]
- }
- } else if (item.productCode === 'GFRS_A0005') {
- // 设置默认值?
- }
+ })
+ this.$forceUpdate()
})
- this.$forceUpdate()
+ } else {
+ //其他产品删掉两个字段
+ let calFactorLst = item.calFactorLst
+ for (let i = calFactorLst.length - 1; i >= 0; i--) {
+ let item = calFactorLst[i]
+ if (item.code === 'getLimit' || item.code === 'getRate') {
+ calFactorLst.splice(i, 1)
+ }
+ }
}
})
+
+ // this.influenceAddRiskCodes
+
+ if (this.chooseProducts[0].influences && this.chooseProducts[0].influences.length > 0) {
+ this.influences = this.chooseProducts[0].influences
+ this.chooseProducts[0].influences.forEach(item => {
+ this.influenceAddRiskCodes.push(item.productCode)
+ })
+ }
+
+ this.mainRiskInfluenceAddRisk()
+ //初始化数据试算
+ this.getTrial()
},
// 责任保额份数变化
dutyStepperChange(value, productIndex, calFactorIndex, dutyItemIndex, isChecked, min, max) {
//这个险种使用其他验证方式
- // GFRS_M0016 GFRS_A0004 使用其他验证方式
- if (this.chooseProducts[productIndex].productCode === 'GFRS_M0016' || this.chooseProducts[productIndex].productCode === 'GFRS_A0004') return
- let showHint = this.chooseProducts[productIndex].hint
if (this.mainRiskCode === 'GFRS_M0016') return
if (this.chooseProducts[productIndex].productCode === 'GFRS_A0003') {
this.getTrial()
@@ -522,16 +489,16 @@ export default {
}
let currentEle = this.chooseProducts[productIndex].calFactorLst[calFactorIndex].rules[dutyItemIndex]
if (value < min || value > max) {
- this.$toast(showHint)
+ this.$toast(localStorage.hint)
} else {
if ((Number(value) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
Dialog.alert({
- message: showHint
+ message: localStorage.hint
}).then(() => {
currentEle.defaultDutyAmt = currentEle.minDutyAmt
})
- // this.$toast(showHint)
+ // this.$toast(localStorage.hint)
} else {
// this.mainRiskInfluenceAddRisk()
// currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
@@ -626,24 +593,15 @@ export default {
].rules[dutyItemIndex]['necess']
return false
}
- this.valiAndSend(dutyItem, productIndex, calFactorIndex, dutyItemIndex)
+ this.valiAndSend(dutyItem)
},
- valiAndSend(dutyItem, productIndex, calFactorIndex, dutyItemIndex) {
- let showHint = this.chooseProducts[productIndex].hint
- let currentEle = this.chooseProducts[productIndex].calFactorLst[calFactorIndex].rules[dutyItemIndex]
+ valiAndSend(dutyItem) {
//验证责任
let inputValue = dutyItem.defaultDutyAmt,
duty = dutyItem.duty
- if (this.chooseProducts[productIndex].productCode === 'GFRS_M0016' && !this.valiDuty(inputValue, duty)) {
+ if (this.mainRiskCode === 'GFRS_M0016' && !this.valiDuty(inputValue, duty)) {
//验证不通过
return
- } else if (
- this.chooseProducts[productIndex].productCode === 'GFRS_A0004' &&
- currentEle.duty == '320205' &&
- !this.valiA0004Duty(inputValue, showHint, currentEle)
- ) {
- //验证不通过 险种为GFRS_A0004 责任编码为320205
- return
} else {
this.mainRiskInfluenceAddRisk()
this.getTrial()
@@ -653,13 +611,13 @@ export default {
focusStep() {
this.nextStepFlag = true
},
- blurStep(dutyItem, productIndex, calFactorIndex, dutyItemIndex) {
+ blurStep(dutyItem) {
this.nextStepFlag = false
//失去焦点时做验证
if (dutyItem.necess) {
//勾选时才做验证
- this.valiAndSend(dutyItem, productIndex, calFactorIndex, dutyItemIndex)
+ this.valiAndSend(dutyItem)
}
},
//险种GFRS_M0016的责任的验证规则
@@ -679,27 +637,6 @@ export default {
}
}
},
- //险种 GFRS_A0004 险种验证规则
- valiA0004Duty(value, showHint, currentEle) {
- // 保额只能为5000 10000 15000 200000
- if (currentEle.duty == '320205') {
- if (!(value == '0.5' || value == '1' || value == '1.5' || value == '2')) {
- this.$toast(showHint)
- this.nextStepFlag = true
- return false
- }
- if (this.mainRiskCode === 'GFRS_M0005') {
- if (!(value == '0.5' || value == '1')) {
- this.$toast(showHint)
- this.nextStepFlag = true
- return false
- }
- }
- this.nextStepFlag = false
- return true
- }
- return true
- },
/********start 通用规则、特殊规则处理 start******/
//通用规则1:交费方式为一次交情,无交费期限
hiddenPayEndYear(currentEle) {
@@ -739,7 +676,7 @@ export default {
let age = Number(this.saleInsuredPersonInfo.age)
for (let i = 0; i < currentEle.rules.length; i++) {
if (currentEle.rules[i].payEndYear == value && age > currentEle.rules[i].maxAge) {
- this.$toast('被保险人年龄不适合该交费期间!')
+ this.$toast('被保人年龄不适合该交费期间!')
return true
}
}
@@ -750,7 +687,7 @@ export default {
let age = Number(this.saleInsuredPersonInfo.age)
for (let i = 0; i < currentEle.rules.length; i++) {
if (currentEle.rules[i].insuYear == value && age > currentEle.rules[i].maxAge) {
- this.$toast('被保险人年龄不适合该保险期间!')
+ this.$toast('被保人年龄不适合该保险期间!')
return true
}
}
@@ -1128,7 +1065,6 @@ export default {
console.log(defalutValue, productIndex, calFactorIndex, min, max)
console.log(this.saleInsuredPersonInfo.age)
console.log(riskFactor)
- let showHint = this.chooseProducts[productIndex].hint
let currentEle =
localStorage.isTrial !== '1' && this.chooseProducts[productIndex].isMainRisk == '0'
? this.chooseProducts[productIndex].productTrialYearDTOS[calFactorIndex]
@@ -1141,12 +1077,12 @@ export default {
if (this.saleInsuredPersonInfo.age >= 50 && this.saleInsuredPersonInfo.age <= 65) {
//使用rules规则里的第二条控制保额份数
if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) {
- this.$toast(showHint)
+ this.$toast(localStorage.hint)
this.nextStepFlag = true
} else {
if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
// this.defalutAmt = currentEle.rules[productIndex].displayAmount
- this.$toast(showHint)
+ this.$toast(localStorage.hint)
this.nextStepFlag = true
} else {
this.mainRiskInfluenceAddRisk()
@@ -1158,12 +1094,12 @@ export default {
} else if (this.saleInsuredPersonInfo.age >= 66 && this.saleInsuredPersonInfo.age <= 75) {
//使用rules规则里的第一条控制保额份数
if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) {
- this.$toast(showHint)
+ this.$toast(localStorage.hint)
this.nextStepFlag = true
} else {
if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
// this.defalutAmt = currentEle.rules[productIndex].displayAmount
- this.$toast(showHint)
+ this.$toast(localStorage.hint)
this.nextStepFlag = true
} else {
this.mainRiskInfluenceAddRisk()
@@ -1208,12 +1144,12 @@ export default {
}
} else {
if (Number(defalutValue) < Number(min) || Number(defalutValue) > Number(max)) {
- this.$toast(showHint)
+ this.$toast(localStorage.hint)
this.nextStepFlag = true
} else {
if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
// defalutValue = currentEle.rules[productIndex].displayAmount
- this.$toast(showHint)
+ this.$toast(localStorage.hint)
this.nextStepFlag = true
} else {
this.mainRiskInfluenceAddRisk()
@@ -1244,24 +1180,6 @@ export default {
}
}
}
- //GFRS_A0004需要验证责任
- for (let m = 0; m < this.chooseProducts.length; m++) {
- if (this.chooseProducts[m].productCode == 'GFRS_A0004') {
- let showHint = this.chooseProducts[m].hint
- let calFactorLst = this.chooseProducts[m].calFactorLst
- for (let i = 0; i < calFactorLst.length; i++) {
- if (calFactorLst[i].code === 'dutyGroup') {
- let duties = calFactorLst[i].rules
- for (let j = 0; j < duties.length; j++) {
- let item = duties[j]
- if (!this.valiA0004Duty(item.defaultDutyAmt, showHint, item)) {
- return
- }
- }
- }
- }
- }
- }
//组装险种提交数据
let [mainRiskCode, riskDTOLst] = ['', []]
diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue
index 0a516e25b..e52828e17 100644
--- a/src/views/ebiz/common/MainRiskList.vue
+++ b/src/views/ebiz/common/MainRiskList.vue
@@ -157,7 +157,6 @@ export default {
calFactorLst,
hasAddtionRisk,
isMainRisk: 0,
- hint: resultData.hint,
riskType: resultData.riskType,
riskName: this.result.riskName,
productCode: this.result.riskProductCode,
@@ -173,7 +172,6 @@ export default {
calFactorLst,
hasAddtionRisk,
isMainRisk: 0,
- hint: resultData.hint,
riskType: resultData.riskType,
riskName: this.result.riskName,
productCode: this.result.riskProductCode,
diff --git a/src/views/ebiz/common/risk-rules.js b/src/views/ebiz/common/risk-rules.js
index 384e295cb..d0b68a99b 100644
--- a/src/views/ebiz/common/risk-rules.js
+++ b/src/views/ebiz/common/risk-rules.js
@@ -7,7 +7,7 @@ export default {
tips = '投保人年龄不适合此款险种,请选择其他险种!'
} else {
age = this.getSaleInsuredPersonInfo().age
- tips = '被保险人年龄不适合此款险种,请选择其他险种!'
+ tips = '被保人年龄不适合此款险种,请选择其他险种!'
}
let minAge = resultData.productTrialInfoDTO.ageRange && resultData.productTrialInfoDTO.ageRange.minAge
let maxAge = resultData.productTrialInfoDTO.ageRange && resultData.productTrialInfoDTO.ageRange.maxAge;
@@ -24,7 +24,7 @@ export default {
let socialInsurance = resultData.productInsuredDTO.socialInsurance
if (socialInsurance == 0) return false
if (currentMedical != socialInsurance) {
- vm.$toast('被保险人社保情况不适合此款险种,请选择其他险种!')
+ vm.$toast('被保人社保情况不适合此款险种,请选择其他险种!')
return true
}
return false
diff --git a/src/views/ebiz/nbs/Base.vue b/src/views/ebiz/nbs/Base.vue
index ed2cb4f33..a6c861609 100644
--- a/src/views/ebiz/nbs/Base.vue
+++ b/src/views/ebiz/nbs/Base.vue
@@ -107,7 +107,7 @@ let relationItem = {
lifeRiskGrade: '',
medicalRiskGrade: '',
isDelete: '0',
- familyId: '',
+
//下面的属性 保存时不需要传
isOccupationPickerPopupShow: false
}
diff --git a/src/views/ebiz/proposal/ChooseInsuredPerson.vue b/src/views/ebiz/proposal/ChooseInsuredPerson.vue
index c8641366b..f7e594cf9 100644
--- a/src/views/ebiz/proposal/ChooseInsuredPerson.vue
+++ b/src/views/ebiz/proposal/ChooseInsuredPerson.vue
@@ -183,7 +183,7 @@ export default {
}
})
if (result) {
- return Toast.fail('请填写被保险人信息')
+ return Toast.fail('请填写被保人信息')
}
if (!hasRisk) {
return Toast.fail('请选择保险产品信息')
@@ -229,7 +229,7 @@ export default {
Dialog.confirm({
className: 'dialog-delete',
title: '提示',
- message: '确认删除该被保险人?',
+ message: '确认删除该被保人?',
cancelButtonColor: '#E9332E',
confirmButtonColor: '#FFFFFF'
})
@@ -276,7 +276,7 @@ export default {
Dialog.confirm({
className: 'dialog-delete',
title: '提示',
- message: '确认删除该被保险人?',
+ message: '确认删除该被保人?',
cancelButtonColor: '#E9332E',
confirmButtonColor: '#FFFFFF'
})
diff --git a/src/views/ebiz/proposal/InsuredPerson.vue b/src/views/ebiz/proposal/InsuredPerson.vue
index 4cbd42e5d..371cdf4f8 100644
--- a/src/views/ebiz/proposal/InsuredPerson.vue
+++ b/src/views/ebiz/proposal/InsuredPerson.vue
@@ -9,7 +9,7 @@
@nameChange="nameChange"
@on-choose="chooseCustomer"
v-validate="'required'"
- name="被保险人"
+ name="被保人"
required
:readonly="disabled"
label="姓名"
@@ -48,15 +48,15 @@
label="职业"
name="职业"
v-validate="'required'"
- placeholder="被保险人职业"
+ placeholder="被保人职业"
/>
- 是被保险人的 + 是被保人的 {{ item.relationToInsured | idToText('relationToAppnt') }}
diff --git a/src/views/ebiz/sale/Detail.vue b/src/views/ebiz/sale/Detail.vue index a337453ec..024f41697 100644 --- a/src/views/ebiz/sale/Detail.vue +++ b/src/views/ebiz/sale/Detail.vue @@ -22,7 +22,7 @@