From 0f4a11daceb31b0865ed785c0059a02db713f653 Mon Sep 17 00:00:00 2001 From: pangxingyue <120277894@qq.com> Date: Mon, 22 Mar 2021 14:05:40 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=8A=95=E4=BF=9D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ebiz/insureAgain/insureAgain.js | 6 +- src/components/ebiz/insureAgain/Order.vue | 20 ++- src/views/ebiz/insureAgain/index.vue | 169 +++++++--------------- 3 files changed, 71 insertions(+), 124 deletions(-) diff --git a/src/api/ebiz/insureAgain/insureAgain.js b/src/api/ebiz/insureAgain/insureAgain.js index 65fe482db..6ef9009d4 100644 --- a/src/api/ebiz/insureAgain/insureAgain.js +++ b/src/api/ebiz/insureAgain/insureAgain.js @@ -1,7 +1,7 @@ /* * @Author: PangXingYue * @Date: 2021-03-04 10:38:24 - * @LastEditTime: 2021-03-04 10:50:17 + * @LastEditTime: 2021-03-22 11:01:02 * @LastEditors: PangXingYue * @Description: * @FilePath: \ebiz-h5\src\api\ebiz\insureAgain\insureAgain.js @@ -9,9 +9,9 @@ import request from '@/assets/js/utils/request' import getUrl from '@/assets/js/utils/get-url' // 订单列表 -export function orderList(data) { +export function getPolicyListAgent(data) { return request({ - url: getUrl('/sale/order/orderList', 1), + url: getUrl('/sale/policy/policyListAgent', 1), method: 'post', data }) diff --git a/src/components/ebiz/insureAgain/Order.vue b/src/components/ebiz/insureAgain/Order.vue index dbb1caf90..ba447b72a 100644 --- a/src/components/ebiz/insureAgain/Order.vue +++ b/src/components/ebiz/insureAgain/Order.vue @@ -1,3 +1,11 @@ +
- {{it.riskName}} - {{it.insuYear}} - {{it.payEndYearFlag == 'Y' ? `${it.payEndYear}年` : `至${it.payEndYear}岁`}} - 一次性交清 - -- - {{it.amt | moneyFormat}} - {{it.riskName}} -
+ {{it.riskName}} + {{it.insuYear}} + {{it.payEndYearFlag == 'Y' ? `${it.payEndYear}年` : + `至${it.payEndYear}岁`}} + 一次性交清 + -- + {{it.amt | moneyFormat}} + {{it.riskName}} + @@ -76,9 +77,10 @@ import InfoCell from '@/components/ebiz/insureAgain/InfoCell' import DropdownBox from '@/components/ebiz/insureAgain/DropdownBox' import dataDictionary from '@/assets/js/utils/data-dictionary' import { Collapse, CollapseItem, Cell, CellGroup, Button } from 'vant' -import { getDetail } from '@/api/ebiz/sale/sale' +import { getReAppntPolicy } from '@/api/ebiz/insureAgain/insureAgain' import { formatAllRisk } from '@/assets/js/utils/formatRiskList' -import { getQuestionList } from '@/api/ebiz/questions' +// import { getQuestionList } from '@/api/ebiz/questions' +import CacheUtils from '@/assets/js/utils/cacheUtils' export default { components: { DropdownBox, @@ -112,242 +114,389 @@ export default { } }, created() { - this.getInsureAgainDetail() + let policyNo = CacheUtils.getLocItem('policyNo') + this.getReAppntPolicy(123) }, methods: { // 获取保单详情 - async getInsureAgainDetail() { + async getReAppntPolicy(policyNo) { let data = { - orderNo: '8186270000012069', - desensitizType: 0 + policyNo: policyNo } - let params = { - type: 3, - pageInfo: { - pageNum: 1, - pageSize: 10 + + // getReAppntPolicy(data).then(res => { + var res = `{ + "orderDTO": { + "appntDTO": { + "area": "", + "averageAnnualIncome": 10, + "avoirdupois": 60, + "birthday": "1983-03-12", + "certiexpiredate": "2035-03-31", + "effectiveDateType": "false", + "email": "310598205@qq.com", + "healthGrade": "1", + "homeAddress": "百苑小区101号", + "homeArea": "450103", + "homeCity": "450100", + "homeProvince": "450000", + "idNo": "452624198303120727", + "idType": "1", + "liabilitiesMoney": "0", + "lifeGrade": "1", + "marriage": "1", + "medical": "0", + "mobile": "13707711024", + "name": "艾琳马上", + "nativeplace": "1", + "occupationCode": "4070103", + "occupationName": "经纪人(内勤)", + "otherSalarySource": "", + "salarySource": "1", + "sex": "1", + "stature": 167, + "taxResidentId": "1", + "workcompany": "国富人寿保险股份有限公司" }, - prtNo: '8186270000012069' - } - try { - let results = await Promise.all([getDetail(data), getQuestionList(params)]) - // 保单详情响应数据 - let res = results[0] - // // 问题件状态响应数据 - let problemResult = results[1] - if (res.result == '0') { - if (res.orderDTO.orderInfoDTO.bnfFlag == '1') { - res.orderDTO.orderInfoDTO.bnfFlag = '指定受益人' - } else if (res.orderDTO.orderInfoDTO.bnfFlag == '0') { - res.orderDTO.orderInfoDTO.bnfFlag = '法定受益人' - } - this.OrderInfoDTO = res.orderDTO.orderInfoDTO - this.appntDTO = res.orderDTO.appntDTO - this.reason = res.orderDTO.reason - - // 投保人信息 - if (res.orderDTO.appntDTO.sex == '0') { - res.orderDTO.appntDTO.sex = '男' - } else if (res.orderDTO.appntDTO.sex == '1') { - res.orderDTO.appntDTO.sex = '女' - } - switch (res.orderDTO.appntDTO.idType) { - case '1': - res.orderDTO.appntDTO.idType = '居民身份证' - break - case '2': - res.orderDTO.appntDTO.idType = '户口本' - break - case '3': - res.orderDTO.appntDTO.idType = '出生证' - break - case '4': - res.orderDTO.appntDTO.idType = '外国人护照' - break - case '5': - res.orderDTO.appntDTO.idType = '港澳居民来往内地通行证' - break - case '6': - res.orderDTO.appntDTO.idType = '台湾居民来往大陆通行证' - break - // case '7': - // res.orderDTO.appntDTO.idType = '其他' - // break - case '8': - res.orderDTO.appntDTO.idType = '外国人永久居留身份证' - break - case '9': - res.orderDTO.appntDTO.idType = '港澳台居民居住证' - break - } - this.appntDTO = res.orderDTO.appntDTO - res.orderDTO.insuredDTOs.map(item => { - item.riskDTOLst.map(it => { - if (it.insuYearFlag == 'Y') { - it.insuYear = `${it.insuYear}年` - } else { - if (it.insuYearFlag == 'A' && it.insuYear == '106') { - it.insuYear = '终身' - } else { - it.insuYear = `至${it.insuYear}周岁的保单周年日` - } - } - - Number(it.payIntv) - switch (it.payIntv) { - case 0: - it.payIntv = '一次性交清' - break - case 1: - it.payIntv = '月交' - break - case 12: - it.payIntv = '年交' - break - } - }) - }) - // 被保险人信息 - res.orderDTO.insuredDTOs.map(item => { - if (item.sex == '0') { - item.sex = '男' - } else if (item.sex == '1') { - item.sex = '女' - } else { - item.sex = '不详' + "insuredDTOs": [ + { + "area": "", + "averageAnnualIncome": 1000, + "avoirdupois": 60, + "birthday": "1983-03-12", + "certiexpiredate": "2035-03-31", + "companyArea": "", + "companyCity": "", + "effectiveDateType": "false", + "healthGrade": "1", + "homeAddress": "百苑小区101号", + "homeArea": "450103", + "homeCity": "450100", + "homeProvince": "450000", + "idNo": "452624198303120727", + "idType": "1", + "liabilitiesMoney": "0", + "lifeGrade": "1", + "marriage": "1", + "medical": "0", + "mobile": "13707711024", + "name": "艾琳咳咳", + "nativeplace": "1", + "occupationCode": "4070103", + "occupationName": "经纪人(内勤)", + "otherSalarySource": "", + "province": "", + "relationToMainInsured": "5", + "salarySource": "1", + "sex": "1", + "stature": 167, + "taxResidentId": "1", + "workcompany": "国富人寿保险股份有限公司", + "bnfDTOs": [ + { + "area": "450103", + "birthday": "1980-01-02", + "bnfLot": 50, + "bnfOrder": 1, + "bnfType": "0", + "certiexpiredate": "2035-03-31", + "city": "450100", + "effectiveDateType": "false", + "healthGrade": "1", + "idNo": "110101198001020219", + "idType": "1", + "lifeGrade": "2", + "marriage": "2", + "mobile": "13707711024", + "name": "爱来", + "nativeplace": "1", + "occupationCode": "2070202", + "occupationName": "保险推销员", + "province": "450000", + "relationToInsured": "3", + "sex": "0", + "village": "百苑小区101号", + "yearSalary": "23" + }, + { + "area": "450103", + "birthday": "1983-03-12", + "bnfLot": 50, + "bnfOrder": 1, + "bnfType": "0", + "certiexpiredate": "2035-03-31", + "city": "450100", + "effectiveDateType": "false", + "healthGrade": "1", + "idNo": "452624198303120727", + "idType": "1", + "lifeGrade": "1", + "marriage": "1", + "mobile": "13707711024", + "name": "艾琳马上来", + "nativeplace": "1", + "occupationCode": "4070103", + "occupationName": "经纪人(内勤)", + "province": "450000", + "relationToInsured": "4", + "sex": "1", + "village": "百苑小区101号", + "yearSalary": "32" + } + ], + "impartDTO": { + "impartItemDTOS": [ + { + "impartAnswer": "1", + "impartCode": "9", + "impartContent": "最近六个月内是否有下列身体不适症状?", + "IntroDuctions": "" + }, + { + "impartAnswer": "1", + "impartCode": "12a", + "impartContent": "是否曾患有失明、视网膜出血或剥离、视神经炎、青光眼、白内障、眼底病变、视野缺失、屈光度1000度以上、聋哑、中耳炎、梅尼尔氏病或其他眼、耳、鼻、喉或口腔疾病?", + "IntroDuctions": "" + } + ] + }, + "riskDTOLst": [ + { + "riskName": "国富人寿国富民惠医疗保险(2020版)", + "insuYear": 1, + "insuYearFlag": "Y", + "payIntv": 12, + "payEndYear": 1000, + "payEndYearFlag": "Y", + "prem": 10000, + "riskCode": "1113202", + "isMainRisk": "0", + "amt": 22640, + "dutyLst": [ + { + "dutyName":"国富民惠医疗保险金", + "dutyCode":"320300", + "amt":1000000, + "prem":536, + "getLimit":"0", + "getRate":"0" + }, + { + "dutyName":"", + "dutyCode":"", + "amt":100000, + "prem":536, + "getLimit":"", + "getRate":"" + } + ] + } + ] } - switch (item.idType) { + ], + "orderAccountDTO": { + "accountName": "艾琳马上", + "bankName": "BOCOM", + "cardBookCode": "4354256325325678790" + } + }, + "result": "0" +}`; + res = JSON.parse(res); + if (res.result == '0') { + console.log(res, '11111111111111111111111aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa') + // if (res.orderDTO.orderInfoDTO.bnfFlag == '1') { + // res.orderDTO.orderInfoDTO.bnfFlag = '指定受益人' + // } else if (res.orderDTO.orderInfoDTO.bnfFlag == '0') { + // res.orderDTO.orderInfoDTO.bnfFlag = '法定受益人' + // } + this.OrderInfoDTO = res.orderDTO.orderInfoDTO + this.appntDTO = res.orderDTO.appntDTO + this.reason = res.orderDTO.reason + + // 投保人信息 + if (res.orderDTO.appntDTO.sex == '0') { + res.orderDTO.appntDTO.sex = '男' + } else if (res.orderDTO.appntDTO.sex == '1') { + res.orderDTO.appntDTO.sex = '女' + } + switch (res.orderDTO.appntDTO.idType) { case '1': - item.idType = '居民身份证' + res.orderDTO.appntDTO.idType = '居民身份证' break case '2': - item.idType = '户口本' + res.orderDTO.appntDTO.idType = '户口本' break case '3': - item.idType = '出生证' + res.orderDTO.appntDTO.idType = '出生证' break case '4': - item.idType = '外国人护照' + res.orderDTO.appntDTO.idType = '外国人护照' break case '5': - item.idType = '港澳居民来往内地通行证' + res.orderDTO.appntDTO.idType = '港澳居民来往内地通行证' break case '6': - item.idType = '台湾居民来往大陆通行证' + res.orderDTO.appntDTO.idType = '台湾居民来往大陆通行证' break // case '7': - // item.idType = '其他' + // res.orderDTO.appntDTO.idType = '其他' // break case '8': - item.idType = '外国人永久居留身份证' + res.orderDTO.appntDTO.idType = '外国人永久居留身份证' break case '9': - item.idType = '港澳台居民居住证' + res.orderDTO.appntDTO.idType = '港澳台居民居住证' break } - switch (item.relationToAppnt) { - case '1': - item.relationToAppnt = '本人' - break - case '2': - item.relationToAppnt = '配偶' - break - case '3': - item.relationToAppnt = '父母' - break - case '4': - item.relationToAppnt = '子女' - break - case '5': - item.relationToAppnt = '其他' - break - } - if (res.orderDTO.orderInfoDTO.bnfFlag == '指定受益人') { - item.bnfDTOs.map(it => { - if (it.sex == '0') { - it.sex = '男' - } else if (it.sex == '1') { - it.sex = '女' + this.appntDTO = res.orderDTO.appntDTO + res.orderDTO.insuredDTOs.map(item => { + item.riskDTOLst.map(it => { + if (it.insuYearFlag == 'Y') { + it.insuYear = `${it.insuYear}年` } else { - it.sex = '不详' + if (it.insuYearFlag == 'A' && it.insuYear == '106') { + it.insuYear = '终身' + } else { + it.insuYear = `至${it.insuYear}周岁的保单周年日` + } } - switch (it.idType) { - case '1': - it.idType = '居民身份证' + + Number(it.payIntv) + switch (it.payIntv) { + case 0: + it.payIntv = '一次性交清' break - case '2': - it.idType = '户口本' + case 1: + it.payIntv = '月交' break - case '3': - it.idType = '出生证' - break - case '4': - it.idType = '外国人护照' - break - case '5': - it.idType = '港澳居民来往内地通行证' - break - case '6': - it.idType = '台湾居民来往大陆通行证' - break - // case '7': - // it.idType = '其他' - // break - case '8': - it.idType = '外国人永久居留身份证' - break - case '9': - it.idType = '港澳台居民居住证' - break - } - switch (it.relationToInsured) { - case '1': - it.relationToInsured = '本人' - break - case '2': - it.relationToInsured = '配偶' - break - case '3': - it.relationToInsured = '父母' - break - case '4': - it.relationToInsured = '子女' - break - case '5': - it.relationToInsured = '其他' + case 12: + it.payIntv = '年交' break } }) - } - }) + }) + // 被保险人信息 + res.orderDTO.insuredDTOs.map(item => { + if (item.sex == '0') { + item.sex = '男' + } else if (item.sex == '1') { + item.sex = '女' + } else { + item.sex = '不详' + } + switch (item.idType) { + case '1': + item.idType = '居民身份证' + break + case '2': + item.idType = '户口本' + break + case '3': + item.idType = '出生证' + break + case '4': + item.idType = '外国人护照' + break + case '5': + item.idType = '港澳居民来往内地通行证' + break + case '6': + item.idType = '台湾居民来往大陆通行证' + break + // case '7': + // item.idType = '其他' + // break + case '8': + item.idType = '外国人永久居留身份证' + break + case '9': + item.idType = '港澳台居民居住证' + break + } + switch (item.relationToAppnt) { + case '1': + item.relationToAppnt = '本人' + break + case '2': + item.relationToAppnt = '配偶' + break + case '3': + item.relationToAppnt = '父母' + break + case '4': + item.relationToAppnt = '子女' + break + case '5': + item.relationToAppnt = '其他' + break + } + // if (res.orderDTO.orderInfoDTO.bnfFlag == '指定受益人') { + // item.bnfDTOs.map(it => { + // if (it.sex == '0') { + // it.sex = '男' + // } else if (it.sex == '1') { + // it.sex = '女' + // } else { + // it.sex = '不详' + // } + // switch (it.idType) { + // case '1': + // it.idType = '居民身份证' + // break + // case '2': + // it.idType = '户口本' + // break + // case '3': + // it.idType = '出生证' + // break + // case '4': + // it.idType = '外国人护照' + // break + // case '5': + // it.idType = '港澳居民来往内地通行证' + // break + // case '6': + // it.idType = '台湾居民来往大陆通行证' + // break + // // case '7': + // // it.idType = '其他' + // // break + // case '8': + // it.idType = '外国人永久居留身份证' + // break + // case '9': + // it.idType = '港澳台居民居住证' + // break + // } + // switch (it.relationToInsured) { + // case '1': + // it.relationToInsured = '本人' + // break + // case '2': + // it.relationToInsured = '配偶' + // break + // case '3': + // it.relationToInsured = '父母' + // break + // case '4': + // it.relationToInsured = '子女' + // break + // case '5': + // it.relationToInsured = '其他' + // break + // } + // }) + // } + }) - this.insuredDTOs = res.orderDTO.insuredDTOs - // 格式化 - this.list = formatAllRisk(this.insuredDTOs[0].riskDTOLst) - } else { - this.$toast(res.resultMessage) - } - - // 问题件状态显示 - if (problemResult.result === '0') { - if (problemResult.content && problemResult.content.list) { - this.problemList.splice(0) - let lists = problemResult.content.list - for (let list of lists) { - let state = this.mapOrderState(list.status) - this.problemList.push({ - comment: list.statusComment, - state - }) - } + this.insuredDTOs = res.orderDTO.insuredDTOs + // 格式化 + this.list = formatAllRisk(this.insuredDTOs[0].riskDTOLst) + // } else { + this.$toast(res.resultMessage) } - } else { - this.$toast(problemResult.resultMessage) - } - } catch (error) { - console.log(error) - this.$toast('网络异常') - } + // }) } } } From 7c02d7928e8b50bab099f4352938a23cc88832b3 Mon Sep 17 00:00:00 2001 From: pangxingyue <120277894@qq.com> Date: Tue, 23 Mar 2021 17:04:00 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=8A=95=E4=BF=9D=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ebiz/insureAgain/insureAgain.js | 12 +++++++++++- src/views/ebiz/insureAgain/insureInformation.vue | 9 +++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/api/ebiz/insureAgain/insureAgain.js b/src/api/ebiz/insureAgain/insureAgain.js index f84c6cfb2..d1ce47ce4 100644 --- a/src/api/ebiz/insureAgain/insureAgain.js +++ b/src/api/ebiz/insureAgain/insureAgain.js @@ -1,7 +1,7 @@ /* * @Author: PangXingYue * @Date: 2021-03-04 10:38:24 - * @LastEditTime: 2021-03-23 11:07:24 + * @LastEditTime: 2021-03-23 16:35:56 * @LastEditors: PangXingYue * @Description: * @FilePath: \ebiz-h5\src\api\ebiz\insureAgain\insureAgain.js @@ -33,4 +33,14 @@ export function saveOrUpdateOrderInfo(data) { method: 'post', data }) +} + + +// 保费计算 +export function commitReOrder(data) { + return request({ + url: getUrl('/sale/order/commitReOrder', 1), + method: 'post', + data + }) } \ No newline at end of file diff --git a/src/views/ebiz/insureAgain/insureInformation.vue b/src/views/ebiz/insureAgain/insureInformation.vue index 3dd181500..5d042d1b5 100644 --- a/src/views/ebiz/insureAgain/insureInformation.vue +++ b/src/views/ebiz/insureAgain/insureInformation.vue @@ -118,7 +118,7 @@ import ProgressBar from '@/components/ebiz/insureAgain/ProgressBar' import DropdownBox from '@/components/ebiz/insureAgain/DropdownBox' import InfoCell from '@/components/ebiz/insureAgain/InfoCell' // import { saveOrUpdateOrderInfo, getOrderDetail } from '@/api/ebiz/insureAgain/insureAgain' -import { getOrderDetail, saveOrUpdateOrderInfo } from '@/api/ebiz/sale/sale' +import { getOrderDetail, insureAgain } from '@/api/ebiz/insureAgain/insureAgain' import DataDictionary from '@/assets/js/utils/data-dictionary' import SelectRadio from '@/components/ebiz/SelectRadio' import getAreaName from '@/assets/js/utils/getAreaNameForSale' @@ -569,11 +569,12 @@ export default { }, async save() { let params = { - orderType: 'APPNT_ORDER', + orderType: 'RE_APPNT_ORDER', orderDTO: { orderInfoDTO: { orderNo: localStorage.orderNo, - isElecCont: this.isElecCont + isElecCont: this.isElecCont, + supportBank: '0' }, appntDTO: this.userInfo, insuredDTOs: this.insuredPersonInfo, @@ -581,7 +582,7 @@ export default { } } let str = '' - let resultData = await saveOrUpdateOrderInfo(params) + let resultData = await commitReOrder(params) if (resultData.result == 0) { localStorage.setItem('orderNo', resultData.orderNo) this.$jump({ From c00494d450f5b2039b85be4f958df508f4715a89 Mon Sep 17 00:00:00 2001 From: pangxingyue <120277894@qq.com> Date: Wed, 24 Mar 2021 09:04:39 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=9C=AA=E6=8F=90=E4=BA=A4=E4=BF=9D?= =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/utils/data-dictionary.js | 14 +++++++ .../ebiz/insureAgain/uncommitInsureDetail.vue | 40 +++++++++++++------ 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js index ac2842605..e64d02288 100644 --- a/src/assets/js/utils/data-dictionary.js +++ b/src/assets/js/utils/data-dictionary.js @@ -1662,6 +1662,20 @@ export default { text: '待客户付款' } ], + contState: [ + { + val: '0', + text: '投保中', + }, + { + val: '1', + text: '承包', + }, + { + val: '4', + text: '终止', + }, + ], // 产品编码 riskType: [ { diff --git a/src/views/ebiz/insureAgain/uncommitInsureDetail.vue b/src/views/ebiz/insureAgain/uncommitInsureDetail.vue index 608e8b0cd..498b20f8b 100644 --- a/src/views/ebiz/insureAgain/uncommitInsureDetail.vue +++ b/src/views/ebiz/insureAgain/uncommitInsureDetail.vue @@ -4,10 +4,10 @@ - {{OrderInfoDTO.orderNo}} - {{OrderInfoDTO.appntDateLabel}} - {{OrderInfoDTO.orderStatus | orderStatusFilter}} - {{OrderInfoDTO.orderNo}} + {{OrderInfoDTO.contNo}} + {{OrderInfoDTO.cValiDate}} + {{OrderInfoDTO.contState | contStateFilter}} + {{OrderInfoDTO.orderStatus | orderStatusFilter}} +
-
+
+ 法定受益人 +
+
+
{{OrderInfoDTO.bnfFlag}}
{{itm.name}} @@ -50,8 +51,9 @@ {{itm.idNo}}
+
-
+
@@ -101,13 +103,21 @@ export default { }, filters: { orderStatusFilter(val) { - for (let status of dataDictionary.policyState) { + for (let status of dataDictionary.orderStatus) { if (status.id === val) { return status.text } } return '' }, + contStateFilter(val) { + for (let status of dataDictionary.contState) { + if (status.val === val) { + return status.text + } + } + return '' + }, reasonFilter(val) { let reg = /'|;/g return val.replace(reg, '') @@ -298,6 +308,12 @@ export default { "accountName": "艾琳马上", "bankName": "BOCOM", "cardBookCode": "4354256325325678790" + }, + "orderInfoDTO": { + "contNo": "保单号", + "contState": "保单状态 1-承保;4-终止;0-投保中", + "cValiDate": "生效日期 String", + "orderStatus": "签收状态 0-未签收 1-已签收" } }, "result": "0" From 925346929cb29874393c2cddf5e9dd3cbdd7dff3 Mon Sep 17 00:00:00 2001 From: pangxingyue <120277894@qq.com> Date: Wed, 24 Mar 2021 18:20:37 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E6=8A=95=E4=BF=9D=E5=85=AC=E5=91=8A=E4=BF=A1=E6=81=AF=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=87=8D=E6=96=B0=E6=8A=95?= =?UTF-8?q?=E4=BF=9D=E7=AD=BE=E5=90=8D=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ebiz/insureAgain/insureAgain.js | 9 +- .../ebiz/insureAgain/ReadingAgreement.vue | 5 + src/router/ebiz/insureAgain.js | 48 +- .../ebiz/insureAgain/InsuranceInformation.vue | 538 ++++++ src/views/ebiz/insureAgain/InsuranceTip.vue | 566 ++++++ src/views/ebiz/insureAgain/ProductTip.vue | 556 ++++++ .../insureAgain/SignatureConfirmation.vue | 1544 +++++++++++++++++ .../insureAgain/SignatureOfElectronic.vue | 1047 +++++++++++ ...sureDetail.vue => commitInsureDetailA.vue} | 0 ...Information.vue => insureInformationA.vue} | 0 src/views/ebiz/insureAgain/notification.vue | 130 -- src/views/ebiz/insureAgain/notificationA.vue | 762 ++++++++ .../insureAgain/{payment.vue => paymentA.vue} | 0 .../{paymentResult.vue => paymentResultA.vue} | 0 ...nformation.vue => productInformationA.vue} | 94 +- .../ebiz/insureAgain/signConfirmation.vue | 90 - ...reDetail.vue => uncommitInsureDetailA.vue} | 0 17 files changed, 5158 insertions(+), 231 deletions(-) create mode 100644 src/views/ebiz/insureAgain/InsuranceInformation.vue create mode 100644 src/views/ebiz/insureAgain/InsuranceTip.vue create mode 100644 src/views/ebiz/insureAgain/ProductTip.vue create mode 100644 src/views/ebiz/insureAgain/SignatureConfirmation.vue create mode 100644 src/views/ebiz/insureAgain/SignatureOfElectronic.vue rename src/views/ebiz/insureAgain/{commitInsureDetail.vue => commitInsureDetailA.vue} (100%) rename src/views/ebiz/insureAgain/{insureInformation.vue => insureInformationA.vue} (100%) delete mode 100644 src/views/ebiz/insureAgain/notification.vue create mode 100644 src/views/ebiz/insureAgain/notificationA.vue rename src/views/ebiz/insureAgain/{payment.vue => paymentA.vue} (100%) rename src/views/ebiz/insureAgain/{paymentResult.vue => paymentResultA.vue} (100%) rename src/views/ebiz/insureAgain/{productInformation.vue => productInformationA.vue} (69%) delete mode 100644 src/views/ebiz/insureAgain/signConfirmation.vue rename src/views/ebiz/insureAgain/{uncommitInsureDetail.vue => uncommitInsureDetailA.vue} (100%) diff --git a/src/api/ebiz/insureAgain/insureAgain.js b/src/api/ebiz/insureAgain/insureAgain.js index d1ce47ce4..67b5dc890 100644 --- a/src/api/ebiz/insureAgain/insureAgain.js +++ b/src/api/ebiz/insureAgain/insureAgain.js @@ -1,7 +1,7 @@ /* * @Author: PangXingYue * @Date: 2021-03-04 10:38:24 - * @LastEditTime: 2021-03-23 16:35:56 + * @LastEditTime: 2021-03-24 10:08:07 * @LastEditors: PangXingYue * @Description: * @FilePath: \ebiz-h5\src\api\ebiz\insureAgain\insureAgain.js @@ -35,8 +35,11 @@ export function saveOrUpdateOrderInfo(data) { }) } - -// 保费计算 +/** + * @description: 重新投保-投保信息保存 + * @param {*} data + * @return {*} + */ export function commitReOrder(data) { return request({ url: getUrl('/sale/order/commitReOrder', 1), diff --git a/src/components/ebiz/insureAgain/ReadingAgreement.vue b/src/components/ebiz/insureAgain/ReadingAgreement.vue index 2d004f566..3eed1f5cd 100644 --- a/src/components/ebiz/insureAgain/ReadingAgreement.vue +++ b/src/components/ebiz/insureAgain/ReadingAgreement.vue @@ -143,6 +143,11 @@ export default { .agreement { height: 100vh; overflow: auto; + .agreement-content{ + padding: 10px; + box-sizing: border-box; + margin-bottom: 120px; + } .agreement-title { font-size: 20px; font-weight: bold; diff --git a/src/router/ebiz/insureAgain.js b/src/router/ebiz/insureAgain.js index 1ec6d4b63..362d93e3e 100644 --- a/src/router/ebiz/insureAgain.js +++ b/src/router/ebiz/insureAgain.js @@ -1,7 +1,7 @@ /* * @Author: PangXingYue * @Date: 2021-03-11 09:07:58 - * @LastEditTime: 2021-03-11 09:15:54 + * @LastEditTime: 2021-03-24 18:03:16 * @LastEditors: PangXingYue * @Description: * @FilePath: \ebiz-h5\src\router\ebiz\insureAgain.js @@ -12,10 +12,14 @@ const CommitInsureDetail = () => import('@/views/ebiz/insureAgain/commitInsureDe const InsureInformation = () => import('@/views/ebiz/insureAgain/insureInformation') const ProductInformation = () => import('@/views/ebiz/insureAgain/productInformation') const Notification = () => import('@/views/ebiz/insureAgain/notification') -const SignConfirmation = () => import('@/views/ebiz/insureAgain/signConfirmation') +const SignatureConfirmation = () => import('@/views/ebiz/insureAgain/SignatureConfirmation') const InsureAgainPayment = () => import('@/views/ebiz/insureAgain/payment') const PaymentResult = () => import('@/views/ebiz/insureAgain/paymentResult') - +const ProductTip = () => import('@/views/ebiz/insureAgain/ProductTip') +const InsuranceTip = () => import('@/views/ebiz/insureAgain/InsuranceTip') +const SignatureOfElectronic = () => import('@/views/ebiz/insureAgain/SignatureOfElectronic') +const InsuranceInformation = () => import('@/views/ebiz/insureAgain/InsuranceInformation') +let riskName = localStorage.riskName export default [ { // 重新投保保单列表 @@ -73,9 +77,9 @@ export default [ }, { // 签名确认 - path: '/insureAgain/signConfirmation', - name: 'signConfirmation', - component: SignConfirmation, + path: '/insureAgain/SignatureConfirmation', + name: 'SignatureConfirmation', + component: SignatureConfirmation, meta: { title: '签名确认' } @@ -98,4 +102,36 @@ export default [ title: '支付结果' } }, + { + path: '/insureAgain/InsuranceTip', + name: 'InsuranceTip', + component: InsuranceTip, + meta: { + title: '阅读人身保险投保提示书' + } + }, + { + path: '/insureAgain/ProductTip', + name: 'ProductTip', + component: ProductTip, + meta: { + title: `${riskName}产品说明书` + } + }, + { + path: '/insureAgain/SignatureOfElectronic', + name: 'SignatureOfElectronic', + component: SignatureOfElectronic, + meta: { + title: '电子投保单签名' + } + }, + { + path: '/insureAgain/InsuranceInformation', + name: 'InsuranceInformation', + component: InsuranceInformation, + meta: { + title: '投保须知' + } + }, ] diff --git a/src/views/ebiz/insureAgain/InsuranceInformation.vue b/src/views/ebiz/insureAgain/InsuranceInformation.vue new file mode 100644 index 000000000..2d88723ad --- /dev/null +++ b/src/views/ebiz/insureAgain/InsuranceInformation.vue @@ -0,0 +1,538 @@ + + + diff --git a/src/views/ebiz/insureAgain/InsuranceTip.vue b/src/views/ebiz/insureAgain/InsuranceTip.vue new file mode 100644 index 000000000..200b8c1db --- /dev/null +++ b/src/views/ebiz/insureAgain/InsuranceTip.vue @@ -0,0 +1,566 @@ + + + diff --git a/src/views/ebiz/insureAgain/ProductTip.vue b/src/views/ebiz/insureAgain/ProductTip.vue new file mode 100644 index 000000000..62c2c8359 --- /dev/null +++ b/src/views/ebiz/insureAgain/ProductTip.vue @@ -0,0 +1,556 @@ + + + diff --git a/src/views/ebiz/insureAgain/SignatureConfirmation.vue b/src/views/ebiz/insureAgain/SignatureConfirmation.vue new file mode 100644 index 000000000..19d21db86 --- /dev/null +++ b/src/views/ebiz/insureAgain/SignatureConfirmation.vue @@ -0,0 +1,1544 @@ + + + + diff --git a/src/views/ebiz/insureAgain/SignatureOfElectronic.vue b/src/views/ebiz/insureAgain/SignatureOfElectronic.vue new file mode 100644 index 000000000..74128a5e2 --- /dev/null +++ b/src/views/ebiz/insureAgain/SignatureOfElectronic.vue @@ -0,0 +1,1047 @@ + + + diff --git a/src/views/ebiz/insureAgain/commitInsureDetail.vue b/src/views/ebiz/insureAgain/commitInsureDetailA.vue similarity index 100% rename from src/views/ebiz/insureAgain/commitInsureDetail.vue rename to src/views/ebiz/insureAgain/commitInsureDetailA.vue diff --git a/src/views/ebiz/insureAgain/insureInformation.vue b/src/views/ebiz/insureAgain/insureInformationA.vue similarity index 100% rename from src/views/ebiz/insureAgain/insureInformation.vue rename to src/views/ebiz/insureAgain/insureInformationA.vue diff --git a/src/views/ebiz/insureAgain/notification.vue b/src/views/ebiz/insureAgain/notification.vue deleted file mode 100644 index 12682bf68..000000000 --- a/src/views/ebiz/insureAgain/notification.vue +++ /dev/null @@ -1,130 +0,0 @@ - - - - - diff --git a/src/views/ebiz/insureAgain/notificationA.vue b/src/views/ebiz/insureAgain/notificationA.vue new file mode 100644 index 000000000..5a42e9c8e --- /dev/null +++ b/src/views/ebiz/insureAgain/notificationA.vue @@ -0,0 +1,762 @@ + + + + + diff --git a/src/views/ebiz/insureAgain/payment.vue b/src/views/ebiz/insureAgain/paymentA.vue similarity index 100% rename from src/views/ebiz/insureAgain/payment.vue rename to src/views/ebiz/insureAgain/paymentA.vue diff --git a/src/views/ebiz/insureAgain/paymentResult.vue b/src/views/ebiz/insureAgain/paymentResultA.vue similarity index 100% rename from src/views/ebiz/insureAgain/paymentResult.vue rename to src/views/ebiz/insureAgain/paymentResultA.vue diff --git a/src/views/ebiz/insureAgain/productInformation.vue b/src/views/ebiz/insureAgain/productInformationA.vue similarity index 69% rename from src/views/ebiz/insureAgain/productInformation.vue rename to src/views/ebiz/insureAgain/productInformationA.vue index 118ac7e8e..c427cc6bc 100644 --- a/src/views/ebiz/insureAgain/productInformation.vue +++ b/src/views/ebiz/insureAgain/productInformationA.vue @@ -88,13 +88,14 @@ import ProgressBar from '@/components/ebiz/insureAgain/ProgressBar' import DropdownBox from '@/components/ebiz/insureAgain/DropdownBox' import InfoCell from '@/components/ebiz/insureAgain/InfoCell' import ReadingAgreement from '@/components/ebiz/insureAgain/ReadingAgreement' +import commitReOrder from '@/api/ebiz/insureAgain/insureAgain' import { Checkbox, RadioGroup, Radio, Dialog } from 'vant' export default { name: 'productInformation', components: { ProgressBar, DropdownBox, - InfoCell, + InfoCell, ReadingAgreement, [Checkbox.name]: Checkbox, [RadioGroup.name]: RadioGroup, @@ -110,7 +111,74 @@ export default { active: 1 } }, + created() { + this.getProductInfo() + }, methods: { + getProductInfo() { + let a = `{ + "orderDTO": { + "insuredDTOs": [ + { + "insuredId": 18425, + "riskDTOLst": [ + { + "amt": 1042, + "insuYear": 85, + "insuYearFlag": "A", + "intMult": 0, + "isMainRisk": "0", + "mainRiskCode": "GFRS_M0002", + "payEndYear": 3, + "payEndYearFlag": "Y", + "payIntv": 12, + "prem": 2000, + "riskCode": "GFRS_M0002", + "riskName": "国富人寿国富民鑫年金保险", + "riskType": "5", + "standPrem": 2000, + "thirdInsuraceNo": "" + }, + { + "amt": 50000, + "dutyLst": [ + { + "amt": 50000, + "dutyCode": "410100", + "dutyName": "意外身故/伤残保险金", + "prem": 80 + } + ], + "getLimit": "0", + "getRate": "1", + "insuYear": 1, + "insuYearFlag": "Y", + "intMult": 0, + "isMainRisk": "1", + "mainRiskCode": "GFRS_M0002", + "payEndYear": 1000, + "payEndYearFlag": "Y", + "payIntv": 0, + "prem": 80, + "riskCode": "GFRS_A0005", + "riskName": "国富人寿附加综合意外伤害保险", + "riskType": "2", + "standPrem": 80, + "thirdInsuraceNo": "" + } + ], + "sex": "1" + } + ], + "orderInfoDTO": { + "orderNo": "8186270000012119", + "supportBank": "0" + } + }, + "orderType": "RE_RISK_ORDER" +}`; +console.log(JSON.parse(a)) + }, appCallBack(data) { if (data.trigger == 'left_button_click') { if (this.show) { @@ -163,14 +231,36 @@ export default { confirmButtonColor: '#ff0000' }) } else { - + this.commitReOrder() } + }, + /** + * @description: 保存产品信息 + * @param {*} + * @return {*} + */ + commitReOrder() { + let data = { + 'orderDTO': { + 'insuredDTOs': '', + 'orderInfoDTO': '', + }, + 'orderType': 'RE_RISK_ORDER' + } + commitReOrder(data).then(res=>{ + if (res.result === '0') { + + } + }) } } } diff --git a/src/views/ebiz/insureAgain/uncommitInsureDetail.vue b/src/views/ebiz/insureAgain/uncommitInsureDetailA.vue similarity index 100% rename from src/views/ebiz/insureAgain/uncommitInsureDetail.vue rename to src/views/ebiz/insureAgain/uncommitInsureDetailA.vue From 1621ff426015b7cbdaeba04538f0182b0598b995 Mon Sep 17 00:00:00 2001 From: pangxingyue <120277894@qq.com> Date: Wed, 24 Mar 2021 18:31:55 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebiz/insureAgain/ProgressBar.vue | 12 +++++- src/router/ebiz/insureAgain.js | 40 +++++++++---------- ...sureDetailA.vue => CommitInsureDetail.vue} | 0 ...InformationA.vue => InsureInformation.vue} | 4 +- .../{notificationA.vue => Notification.vue} | 0 .../insureAgain/{paymentA.vue => Payment.vue} | 0 .../{paymentResultA.vue => PaymentResult.vue} | 0 ...nformationA.vue => ProductInformation.vue} | 2 +- ...reDetailA.vue => UncommitInsureDetail.vue} | 0 src/views/ebiz/insureAgain/index.vue | 12 +++--- 10 files changed, 39 insertions(+), 31 deletions(-) rename src/views/ebiz/insureAgain/{commitInsureDetailA.vue => CommitInsureDetail.vue} (100%) rename src/views/ebiz/insureAgain/{insureInformationA.vue => InsureInformation.vue} (99%) rename src/views/ebiz/insureAgain/{notificationA.vue => Notification.vue} (100%) rename src/views/ebiz/insureAgain/{paymentA.vue => Payment.vue} (100%) rename src/views/ebiz/insureAgain/{paymentResultA.vue => PaymentResult.vue} (100%) rename src/views/ebiz/insureAgain/{productInformationA.vue => ProductInformation.vue} (99%) rename src/views/ebiz/insureAgain/{uncommitInsureDetailA.vue => UncommitInsureDetail.vue} (100%) diff --git a/src/components/ebiz/insureAgain/ProgressBar.vue b/src/components/ebiz/insureAgain/ProgressBar.vue index 94dae39aa..aa28cb3ba 100644 --- a/src/components/ebiz/insureAgain/ProgressBar.vue +++ b/src/components/ebiz/insureAgain/ProgressBar.vue @@ -1,3 +1,11 @@ +