From 26e27f2ae18a38d4ce49f33e30449d186e952c39 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Thu, 9 Jan 2020 15:36:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[FIX]=E5=9B=BD=E5=AF=8C=E4=BA=BA=E5=AF=BF?= =?UTF-8?q?=E9=99=84=E5=8A=A0=E6=8A=95=E4=BF=9D=E4=BA=BA=E8=B1=81=E5=85=8D?= =?UTF-8?q?=E4=BF=9D=E9=99=A9=E8=B4=B9=E5=AE=9A=E6=9C=9F=E5=AF=BF=E9=99=A9?= =?UTF-8?q?-=E4=BF=9D=E8=B4=B9=E8=AF=95=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + src/views/ebiz/common/AddRiskList.vue | 11 ++--------- src/views/ebiz/common/CalculatePremium.vue | 18 ++++++++++-------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index a0dddc6fb..f9e78f3b4 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ yarn-error.log* *.njsproj *.sln *.sw? +.history/ diff --git a/src/views/ebiz/common/AddRiskList.vue b/src/views/ebiz/common/AddRiskList.vue index 00fe65883..f0505e89b 100644 --- a/src/views/ebiz/common/AddRiskList.vue +++ b/src/views/ebiz/common/AddRiskList.vue @@ -63,14 +63,7 @@ export default { this.$toast('请选择产品') return } - //930折中方案，豁免险选择 - let chooseProducts = JSON.parse(localStorage.chooseProducts) - for (let i = 0; i < chooseProducts.length; i++) { - if (chooseProducts[i].productCode == 'DCRS_A0001' && this.result.productCode == 'DCRS_A0001') { - this.$toast('豁免险已选！') - return - } - } + //添加附加险 this.addAddtionRisk() }, @@ -178,7 +171,7 @@ export default { }, //豁免险影响 remitLimit(resultData) { - //isRemit 0是豁免险 1非豁免险 remitType 0投保人 1被保人 + //isRemit 0是豁免险 1非豁免险 remitType 0投保人 1被保人 relationToAppnt 投被关系 let isRemit = resultData.productTrialInfoDTO.isRemit if (isRemit == 1) return false let remitType = resultData.productTrialInfoDTO.remitType diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 727b828a0..07e942e71 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -141,10 +141,7 @@ label="预计转入保费" placeholder="请输入" /> -
+
{ - this.defalutAmt = i.displayAmount + this.defalutAmt = i.displayAmount || 1 console.log(i.displayAmount) console.log(i.defaultValue) this.mult = Number(i.displayAmount) / Number(i.defaultValue) @@ -546,7 +543,6 @@ export default { } } - //2、豁免险跟主险联动，值减一 //2、豁免险跟主险联动，豁免险缴费期间和保险期间同主险的缴费期间 let remitIndex = this.getRemitIndex() if (!remitIndex) return @@ -698,7 +694,12 @@ export default { if (factor.code == 'inputPrem') { trialInfo['prem'] = Number(this.defalutAmt) * Number(factor.moneyUnit) } else { - trialInfo['amt'] = Number(this.defalutAmt) * Number(factor.moneyUnit) + if (item.isRemit == 0) { + trialInfo['amt'] = Number(factor.defaultValue) * Number(factor.moneyUnit) + } else { + trialInfo['amt'] = Number(this.defalutAmt) * Number(factor.moneyUnit) + } + // trialInfo['amt'] = Number(this.defalutAmt) * Number(factor.moneyUnit) } } else if (factor.type == 2) { trialInfo.jobLevel = this.saleInsuredPersonInfo[factor.code] @@ -717,7 +718,8 @@ export default { trialInfo.duty = result } }) - + + console.log("trialInfo == ",trialInfo) //通用规则1：交费方式为一次交情，无交费期限 if (trialInfo['payIntv'] == '0') { trialInfo['payEndYear'] = '1000' From 37993d42e5211e65c491bbc31173d34ba102e568 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Thu, 9 Jan 2020 16:16:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[FIX]=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81(CalculatePremium.vue)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 97 +++++++--------------- 1 file changed, 29 insertions(+), 68 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 07e942e71..25b554c46 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -13,20 +13,8 @@ 主险 附加险 {{ item.riskName }} - 附 - + 附 +
@@ -34,10 +22,7 @@
- {{ riskFactor.name + '(' + riskFactor.suffix + ')' }} + {{ riskFactor.name + '(' + riskFactor.suffix + ')' }} {{ riskFactor.name }}       @@ -70,17 +64,13 @@
{{ riskFactor.name }}
-
+
{{ dutyItem.dutyName }}({{ dutyItem.suffix }})
- - + +
- +
- +
首期保费(元）： + >首期保费(元）： 保额(元）： - {{ trialList[index].prem.toFixed(2) | moneyFormat }} + {{ trialList[index].prem.toFixed(2) | moneyFormat }}
- 完成 + 完成
@@ -254,6 +213,7 @@ export default { } //构建提交数据、渲染险种 this.chooseProducts = JSON.parse(localStorage.chooseProducts) + this.chooseProducts.map(item => { if (item.mainRiskCode == 'GFRS_M0006') { item.isHidden = true @@ -278,6 +238,7 @@ export default { } this.mainRiskInfluenceAddRisk() + //初始化数据试算 this.getTrial() }, @@ -718,8 +679,8 @@ export default { trialInfo.duty = result } }) - - console.log("trialInfo == ",trialInfo) + + console.log('trialInfo == ', trialInfo) //通用规则1：交费方式为一次交情，无交费期限 if (trialInfo['payIntv'] == '0') { trialInfo['payEndYear'] = '1000' @@ -810,7 +771,7 @@ export default { this.getTrial() } } - //被保人年龄如果在66-75之间 + //被保人年龄如果在66-75之间 } else if (this.saleInsuredPersonInfo.age >= 66 && this.saleInsuredPersonInfo.age <= 75) { //使用rules规则里的第一条控制保额份数 if (Number(this.defalutAmt) < Number(riskFactor.rules[0].minPrem) || Number(this.defalutAmt) > Number(riskFactor.rules[0].maxPrem)) { @@ -828,7 +789,7 @@ export default { } } } - //其他产品按照原先的逻辑判断 + //其他产品按照原先的逻辑判断 } else { if (Number(this.defalutAmt) < Number(min) || Number(this.defalutAmt) > Number(max)) { this.$toast(localStorage.hint) From 40cb2a9ade29e51a8f7a0bfd305b6e7d9376782e Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Thu, 9 Jan 2020 16:24:14 +0800 Subject: [PATCH 3/4] [FIX] --- src/api/ebiz/claims/claims.js | 119 ++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 src/api/ebiz/claims/claims.js diff --git a/src/api/ebiz/claims/claims.js b/src/api/ebiz/claims/claims.js new file mode 100644 index 000000000..9aa75d768 --- /dev/null +++ b/src/api/ebiz/claims/claims.js @@ -0,0 +1,119 @@ +import request from '@/assets/js/utils/request' +import getUrl from '@/assets/js/utils/get-url' + +//进度查询列表 +export function progress(data) { + return request({ + url: getUrl(`/claim/claimApply/progress`, 1), + method: 'post', + data + }) +} + +//进度查询详情 +export function progressDetail(data) { + return request({ + url: getUrl(`/claim/claimApply/progressDetail`, 1), + method: 'post', + data + }) +} + +//历史报案列表 +export function history(data) { + return request({ + url: getUrl(`/claim/claimReport/history`, 1), + method: 'post', + data + }) +} + +// //历史报案详情接口 +// export function historyDetail(data) { +// return request({ +// url: getUrl(`/claim/claimReport/historyDetail`, 1), +// method: 'post', +// data +// }) +// } + +//理赔申请 +export function apply(data) { + return request({ + url: getUrl(`/claim/claimApply/apply`, 1), + method: 'post', + data + }) +} + +//客户列表查询 +export function customerList(data) { + return request({ + url: getUrl(`/edor/customer/customerList`, 1), + method: 'post', + data + }) +} + +//客户详情查询 +export function customerInfo(data) { + return request({ + url: getUrl(`/edor/customer/claimCustomerInfo`, 1), + method: 'post', + data + }) +} + +//理赔申请查询 +export function query(data) { + return request({ + url: getUrl(`/claim/claimApply/query`, 1), + method: 'post', + data + }) +} + +//理赔申请删除接口 +export function Delete(data) { + return request({ + url: getUrl(`/claim/claimApply/delete`, 1), + method: 'get', + data + }) +} + +//理赔报案提交 +export function report(data) { + return request({ + url: getUrl(`/claim/claimReport/report`, 1), + method: 'post', + data + }) +} + +//问题件列表接口 +export function issueList(data) { + return request({ + url: getUrl(`/claim/issue/query`, 1), + method: 'post', + data + }) +} + +//问题件提交接口 +export function save(data) { + return request({ + url: getUrl(`/claim/issue/save`, 1), + method: 'post', + data + }) +} + +// 获取验证码 +export function getAuthCode(data) { + return request({ + url: getUrl('/customer/authcode/loginedSend', 1), + method: 'post', + data + }) +} \ No newline at end of file From 4fa3637abfb9a9c9bd0c899beaac5b7fa8af5454 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Thu, 9 Jan 2020 16:54:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[FIX]=E5=8F=96=E6=B6=88=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ebiz/claims/claims.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/ebiz/claims/claims.js b/src/api/ebiz/claims/claims.js index 9aa75d768..1ebca893c 100644 --- a/src/api/ebiz/claims/claims.js +++ b/src/api/ebiz/claims/claims.js @@ -116,4 +116,4 @@ export function getAuthCode(data) { method: 'post', data }) -} \ No newline at end of file +}