diff --git a/src/assets/js/utils/areaNew.js b/src/assets/js/utils/areaNew.js new file mode 100644 index 000000000..a03331c1e --- /dev/null +++ b/src/assets/js/utils/areaNew.js @@ -0,0 +1,134 @@ +export default { + province_list: { + 450000: '广西壮族自治区' + }, + city_list: { + 450100: '南宁市', + 450200: '柳州市', + 450300: '桂林市', + 450400: '梧州市', + 450500: '北海市', + 450600: '防城港市', + 450700: '钦州市', + 450800: '贵港市', + 450900: '玉林市', + 451000: '百色市', + 451100: '贺州市', + 451200: '河池市', + 451300: '来宾市', + 451400: '崇左市' + }, + county_list: { + 450102: '兴宁区', + 450103: '青秀区', + 450105: '江南区', + 450107: '西乡塘区', + 450108: '良庆区', + 450109: '邕宁区', + 450110: '武鸣区', + 450123: '隆安县', + 450124: '马山县', + 450125: '上林县', + 450126: '宾阳县', + 450127: '横县', + 450202: '城中区', + 450203: '鱼峰区', + 450204: '柳南区', + 450205: '柳北区', + 450206: '柳江区', + 450222: '柳城县', + 450223: '鹿寨县', + 450224: '融安县', + 450225: '融水苗族自治县', + 450226: '三江侗族自治县', + 450302: '秀峰区', + 450303: '叠彩区', + 450304: '象山区', + 450305: '七星区', + 450311: '雁山区', + 450312: '临桂区', + 450321: '阳朔县', + 450323: '灵川县', + 450324: '全州县', + 450325: '兴安县', + 450326: '永福县', + 450327: '灌阳县', + 450328: '龙胜各族自治县', + 450329: '资源县', + 450330: '平乐县', + 450332: '恭城瑶族自治县', + 450381: '荔浦市', + 450403: '万秀区', + 450405: '长洲区', + 450406: '龙圩区', + 450421: '苍梧县', + 450422: '藤县', + 450423: '蒙山县', + 450481: '岑溪市', + 450502: '海城区', + 450503: '银海区', + 450512: '铁山港区', + 450521: '合浦县', + 450602: '港口区', + 450603: '防城区', + 450621: '上思县', + 450681: '东兴市', + 450702: '钦南区', + 450703: '钦北区', + 450721: '灵山县', + 450722: '浦北县', + 450802: '港北区', + 450803: '港南区', + 450804: '覃塘区', + 450821: '平南县', + 450881: '桂平市', + 450902: '玉州区', + 450903: '福绵区', + 450921: '容县', + 450922: '陆川县', + 450923: '博白县', + 450924: '兴业县', + 450981: '北流市', + 451002: '右江区', + 451021: '田阳县', + 451022: '田东县', + 451023: '平果县', + 451024: '德保县', + 451026: '那坡县', + 451027: '凌云县', + 451028: '乐业县', + 451029: '田林县', + 451030: '西林县', + 451031: '隆林各族自治县', + 451081: '靖西市', + 451102: '八步区', + 451103: '平桂区', + 451121: '昭平县', + 451122: '钟山县', + 451123: '富川瑶族自治县', + 451202: '金城江区', + 451203: '宜州区', + 451221: '南丹县', + 451222: '天峨县', + 451223: '凤山县', + 451224: '东兰县', + 451225: '罗城仫佬族自治县', + 451226: '环江毛南族自治县', + 451227: '巴马瑶族自治县', + 451228: '都安瑶族自治县', + 451229: '大化瑶族自治县', + 451302: '兴宾区', + 451321: '忻城县', + 451322: '象州县', + 451323: '武宣县', + 451324: '金秀瑶族自治县', + 451381: '合山市', + 451402: '江州区', + 451421: '扶绥县', + 451422: '宁明县', + 451423: '龙州县', + 451424: '大新县', + 451425: '天等县', + 451481: '凭祥市' + } +} diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js index 275eadb3a..331c084d1 100644 --- a/src/assets/js/utils/data-dictionary.js +++ b/src/assets/js/utils/data-dictionary.js @@ -583,7 +583,7 @@ export default { }, { id: '16', - text: '待手动承保' + text: '等待出单' }, { id: '17', @@ -704,6 +704,42 @@ export default { { id: '46', text: '自核不通过待转人核' + }, + { + id: '47', + text: '核心系统繁忙,请稍后重试' + }, + { + id: '48', + text: '修改账户信息' + }, + { + id: '49', + text: '修改银行影像信息' + }, + { + id: '50', + text: '待人核' + }, + { + id: '51', + text: '人工核保中' + }, + { + id: '52', + text: '问题件处理中' + }, + { + id: '53', + text: '待收费' + }, + { + id: '54', + text: '延期' + }, + { + id: '55', + text: '支付失败' } ], // 产品编码 diff --git a/src/assets/js/utils/get-area-name.js b/src/assets/js/utils/get-area-name.js index 13b8e6c95..87d18ca92 100644 --- a/src/assets/js/utils/get-area-name.js +++ b/src/assets/js/utils/get-area-name.js @@ -1,5 +1,6 @@ // 获取省市区名称 import area from '@/assets/js/utils/area' +import areaNew from '@/assets/js/utils/areaNew' /** * 获取省市区名称 @@ -13,9 +14,13 @@ import area from '@/assets/js/utils/area' // return area.province_list[provinceCode] + '-' + area.city_list[cityCode] + '-' + area.county_list[areaCode] // } -export default function getAreaName(data) { +export default function getAreaName(data, from) { if (data.length == 3) { - return area.province_list[data[0].code] + '-' + area.city_list[data[1].code] + '-' + area.county_list[data[2].code] + if (from == 'new') { + return areaNew.province_list[data[0].code] + '-' + areaNew.city_list[data[1].code] + '-' + areaNew.county_list[data[2].code] + } else { + return area.province_list[data[0].code] + '-' + area.city_list[data[1].code] + '-' + area.county_list[data[2].code] + } } else { return area.province_list[data[0].code] + '-' + area.city_list[data[1].code] } diff --git a/src/components/ebiz/customer/formBlock.vue b/src/components/ebiz/customer/formBlock.vue index 9bb24b857..15d941c11 100644 --- a/src/components/ebiz/customer/formBlock.vue +++ b/src/components/ebiz/customer/formBlock.vue @@ -190,7 +190,7 @@ - + @@ -206,6 +206,7 @@ import FieldDatePicter from '@/components/ebiz/FieldDatePicter' import DataDictionary from '@/assets/js/utils/data-dictionary' import OccupationPicker from '@/components/ebiz/occipation/OccupationPicker' import areaList from '@/assets/js/utils/area' +import areaLists from '@/assets/js/utils/areaNew' import utilsAge from '@/assets/js/utils/age' import getAreaName from '@/assets/js/utils/get-area-name' import idNoCheck from '@/assets/js/utils/idNoCheck' @@ -248,6 +249,7 @@ export default { homeName: '', //家庭地址 marriage: '', areaList: areaList, + areaLists: areaLists, customerType: '', customerSource: '', age: '', @@ -546,7 +548,7 @@ export default { this.areaShow = false break case '2': //家庭地址 - this.homeName = getAreaName(area) + this.homeName = getAreaName(area, 'new') ;[this.userInfo.homeProvince, this.userInfo.homeCity, this.userInfo.homeArea] = [area[0].code, area[1].code, area[2].code] this.homeShow = false break diff --git a/src/config/index.js b/src/config/index.js index d8617b6be..253ccc47d 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -11,31 +11,24 @@ let apiDomain, imgDomain, assetsUrl, mainUrl, payUrl // 保融支付的收银台 console.log('环境:', process.env.VUE_APP_FLAG) switch (process.env.VUE_APP_FLAG) { case 'dev': - // apiDomain = 'http://47.96.143.111:7000/api/v1' apiDomain = 'http://139.199.50.151:7000/api/v1' // 国富api - // apiDomain = 'http://10.11.2.247004/' - // imgDomain = 'http://10.10.100.98:7012/updown' // dev imgDomain = 'http://211.159.248.123:7012/updown' // dev // 静态服务资源 assetsUrl = 'http://139.199.50.151:8000/app/' mainUrl = 'http://139.199.50.151' - // payUrl = 'http://10.10.100.84:7003/s3-modules-gateway/embed/gateway.action' payUrl = 'http://funduat.e-guofu.com/s3-modules-gateway/embed/gateway.action' break case 'uat': - apiDomain = '' - imgDomain = '' + apiDomain = 'http://115.159.235.59:7000/api/v1' // 国富api + imgDomain = 'http://139.199.50.145:7012/updown' // 静态服务资源 - assetsUrl = '' - mainUrl = '' - payUrl = '' + assetsUrl = 'http://115.159.235.59:8000/app/' + mainUrl = 'http://115.159.235.59' + payUrl = 'http://funduat.e-guofu.com/s3-modules-gateway/embed/gateway.action' break case 'prd': apiDomain = 'https://iagentsales.e-guofu.com/api/v1' imgDomain = 'https://iagentsales-ud.e-guofu.com:8553/updown' - // imgDomain = 'http://10.10.100.98:7012/updown' // 上生产前 - // 静态服务资源 - // assetsUrl = 'http://211.159.248.138:7001/' // 上生产前 assetsUrl = 'https://iagentsales-sr.e-guofu.com:8443/' mainUrl = 'https://iagentsales.e-guofu.com' payUrl = 'https://uns3.e-guofu.com/s3-modules-gateway/embed/gateway.action' @@ -64,4 +57,4 @@ export default { assetsUrl, mainUrl, payUrl -} +} \ No newline at end of file diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 68f83015f..5435010ee 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -21,16 +21,18 @@
-
+
{{ riskFactor.name + '(' + riskFactor.suffix + ')' }} {{ riskFactor.name }}       @@ -59,7 +61,9 @@ { - if (i.defaultValue) { - this.mult = i.defaultValue + if(item.mainRiskCode != 'GFRS_M0008') { + item.calFactorLst.map(i => { + this.defalutAmt = i.displayAmount + console.log(i.displayAmount) + console.log(i.defaultValue) + this.mult = Number(i.displayAmount) / Number(i.defaultValue) + }) } }) - }) // this.influenceAddRiskCodes @@ -226,27 +236,42 @@ export default { }, // 责任保额份数变化 dutyStepperChange(value, productIndex, calFactorIndex, dutyItemIndex, isChecked, min, max) { + let currentEle = this.chooseProducts[productIndex].calFactorLst[calFactorIndex].rules[dutyItemIndex] if (value < min || value > max) { - this.nextStepFlag = true - this.changeFlag = false + this.$toast(localStorage.hint) } else { - this.changeFlag = true - } - if (isChecked) { - ;[this.productIndex, this.calFactorIndex] = [productIndex, calFactorIndex] - let currentEle = this.chooseProducts[productIndex].calFactorLst[calFactorIndex].rules - currentEle.forEach(item => { - item.amt = Number(item.minDutyAmt) * Number(item.moneyUnit) - }) - this.mainRiskInfluenceAddRisk() - this.getTrial() - } else { - ;[this.productIndex, this.calFactorIndex] = [productIndex, calFactorIndex] - let currentEle = this.chooseProducts[productIndex].calFactorLst[calFactorIndex].rules - currentEle.forEach(item => { - item.amt = Number(item.minDutyAmt) * Number(item.moneyUnit) - }) + if ((Number(value) * 10000) % (Number(currentEle.limit) * 10000) != 0) { + Dialog.alert({ + message: localStorage.hint + }).then(()=> { + currentEle.defaultDutyAmt = currentEle.minDutyAmt + }) + + // this.$toast(localStorage.hint) + + } else { + // this.mainRiskInfluenceAddRisk() + // currentEle['amt'] = Number(currentEle.defaultValue) * Number(currentEle.moneyUnit) + // this.getTrial() + if (isChecked) { + ;[this.productIndex, this.calFactorIndex] = [productIndex, calFactorIndex] + let currentEle = this.chooseProducts[productIndex].calFactorLst[calFactorIndex].rules + currentEle.forEach(item => { + item.amt = Number(item.minDutyAmt) * Number(item.moneyUnit) + }) + this.mainRiskInfluenceAddRisk() + this.getTrial() + } else { + ;[this.productIndex, this.calFactorIndex] = [productIndex, calFactorIndex] + let currentEle = this.chooseProducts[productIndex].calFactorLst[calFactorIndex].rules + currentEle.forEach(item => { + item.amt = Number(item.minDutyAmt) * Number(item.moneyUnit) + }) + } + } } + + }, //弹框选择 toSelect(index, index1, columns) { @@ -623,9 +648,9 @@ export default { } } else if (factor.type == 1) { if (factor.code == 'inputPrem') { - trialInfo['prem'] = Number(factor.defaultValue) * Number(factor.moneyUnit) + trialInfo['prem'] = Number(this.defalutAmt) * Number(factor.moneyUnit) } else { - trialInfo['amt'] = Number(factor.defaultValue) * Number(factor.moneyUnit) + trialInfo['amt'] = Number(this.defalutAmt) * Number(factor.moneyUnit) } } else if (factor.type == 2) { trialInfo.jobLevel = this.saleInsuredPersonInfo[factor.code] @@ -646,7 +671,7 @@ export default { }) //通用规则1:交费方式为一次交情,无交费期限 - if (trialInfo['payIntv'] == '0') { + if (trialInfo['payIntv'] == '0') { trialInfo['payEndYear'] = '1000' trialInfo['payEndYearFlag'] = 'Y' // 福宝宝和万能险传A @@ -707,24 +732,29 @@ export default { }) }, //保额份数变化 - stepperChange(value, productIndex, calFactorIndex) { + stepperChange(defalutValue, productIndex, calFactorIndex, min, max ) { + // debugger + let currentEle = this.chooseProducts[productIndex].calFactorLst[calFactorIndex] + if (Number(this.defalutAmt) < Number(min) || Number(this.defalutAmt) > Number(max)) { + this.$toast(localStorage.hint) + this.nextStepFlag = true + } else { + if ((Number(this.defalutAmt) * 10000) % (Number(currentEle.limit) * 10000) != 0) { + // this.defalutAmt = currentEle.rules[productIndex].displayAmount + this.$toast(localStorage.hint) + this.nextStepFlag = true + } else { + this.mainRiskInfluenceAddRisk() + currentEle['amt'] = Number(this.defalutAmt) * Number(currentEle.moneyUnit) + this.getTrial() + } + } // let currentEle = this.chooseProducts[this.productIndex].calFactorLst[this.calFactorIndex] // currentEle.defaultValue = value console.log('进来几次') - this.mult = value - let currentEle = this.chooseProducts[productIndex].calFactorLst[calFactorIndex] - if ((Number(value) * 10000) % (Number(currentEle.limit) * 10000) != 0) { - Dialog.alert({ - message: localStorage.hint - }).then(() => { - currentEle.defaultValue = currentEle.rules[productIndex].defaultValue - // this.nextStepFlag = true - }) - } else { - this.mainRiskInfluenceAddRisk() - currentEle['amt'] = Number(currentEle.defaultValue) * Number(currentEle.moneyUnit) - this.getTrial() - } + this.mult = Number(this.defalutAmt) / Number(defalutValue) + + }, //下一步 async nextStep() { diff --git a/src/views/ebiz/proposal/Exhibition.vue b/src/views/ebiz/proposal/Exhibition.vue index 11c60c2ab..354178012 100644 --- a/src/views/ebiz/proposal/Exhibition.vue +++ b/src/views/ebiz/proposal/Exhibition.vue @@ -380,6 +380,7 @@ export default { insuredDTOs = formatRiskList(insuredDTOs, 'insuredDTOs', 'riskDTOLst') this.insuredDTOs = insuredDTOs[0].insuredDTOs this.insuredDTOs = relevance(this.insuredDTOs, insuredLabelResult, insuredResult, insuredInfoResult, this.amtFormat, this.dutyLst) //进行数据关联 + // console.log('insuredDTOs',insuredDTOs) this.getWXTitle(this.insuredDTOs) //获取微信标题 let active = this.insuredDTOs.length //默认展开项 this.activeNames = [active] diff --git a/src/views/ebiz/sale/AccountInformation.vue b/src/views/ebiz/sale/AccountInformation.vue index 2aee119a8..bb917b0b7 100644 --- a/src/views/ebiz/sale/AccountInformation.vue +++ b/src/views/ebiz/sale/AccountInformation.vue @@ -2,7 +2,7 @@
- {{ `投保人:${saleInsuredInfo.name}` }} + {{ `投保人:${saleInsuredInfo.name}` }} @@ -22,10 +22,12 @@ v-validate="'required|bankCard'" data-vv-name="银行卡号" /> - 银行卡扫描 + 银行卡扫描 - + - +
@@ -140,7 +142,8 @@ export default { // 是否显示自动垫交 isAutoPay: '', // 是否显示自动续保 - isRenew: '' + isRenew: '', + changeCard: localStorage.changeCard } }, methods: { @@ -238,87 +241,110 @@ export default { that.$validator.validate().then(valid => { if (valid === true) { let data = {} + //支付失败换卡 + if (localStorage.changeCard) { + data = { + orderType: 'ACCOUNTNEW_ORDER', - if (that.checked == true) { - if (this.isChecked == true) { - data = { - orderType: 'ACCOUNT_ORDER', - - orderDTO: { - orderInfoDTO: { - orderNo: window.localStorage.getItem('orderNo') - }, - orderAccountDTO: { - accountType: that.radio, - accountName: that.name, - bankName: that.bank, - bankCode: that.bankCode, - cardBookType: '1', - cardBookCode: that.bankId, - isAutoPay: '0', - isAutoRenewal: '0' - } - } - } - } else { - data = { - orderType: 'ACCOUNT_ORDER', - - orderDTO: { - orderInfoDTO: { - orderNo: window.localStorage.getItem('orderNo') - }, - orderAccountDTO: { - accountType: that.radio, - accountName: that.name, - bankName: that.bank, - bankCode: that.bankCode, - cardBookType: '1', - cardBookCode: that.bankId, - isAutoPay: '0', - isAutoRenewal: this.isRenew == '0' ? '1' : '' - } + orderDTO: { + orderInfoDTO: { + orderNo: window.localStorage.getItem('orderNo') + }, + orderAccountDTO: { + bankName: that.bank, + bankCode: that.bankCode, + cvv2Code: '0', + cardBookCode: that.bankId } } } } else { - if (this.isChecked == true) { - data = { - orderType: 'ACCOUNT_ORDER', + // 垫付 + if (that.checked == true) { + // 续保 + if (this.isChecked == true) { + data = { + orderType: 'ACCOUNT_ORDER', - orderDTO: { - orderInfoDTO: { - orderNo: window.localStorage.getItem('orderNo') - }, - orderAccountDTO: { - accountType: that.radio, - accountName: that.name, - bankName: that.bank, - bankCode: that.bankCode, - cardBookType: '1', - cardBookCode: that.bankId, - isAutoPay: this.isAutoPay == '0' ? '1' : '', - isAutoRenewal: '0' + orderDTO: { + orderInfoDTO: { + orderNo: window.localStorage.getItem('orderNo') + }, + orderAccountDTO: { + accountType: that.radio, + accountName: that.name, + bankName: that.bank, + bankCode: that.bankCode, + cardBookType: '1', + cardBookCode: that.bankId, + isAutoPay: '0', + isAutoRenewal: '0' + } + } + } + } else { + // 垫付不续保 + data = { + orderType: 'ACCOUNT_ORDER', + + orderDTO: { + orderInfoDTO: { + orderNo: window.localStorage.getItem('orderNo') + }, + orderAccountDTO: { + accountType: that.radio, + accountName: that.name, + bankName: that.bank, + bankCode: that.bankCode, + cardBookType: '1', + cardBookCode: that.bankId, + isAutoPay: '0', + isAutoRenewal: this.isRenew == '0' ? '1' : '' + } } } } } else { - data = { - orderType: 'ACCOUNT_ORDER', + // 不垫付 续保 + if (this.isChecked == true) { + data = { + orderType: 'ACCOUNT_ORDER', - orderDTO: { - orderInfoDTO: { - orderNo: window.localStorage.getItem('orderNo') - }, - orderAccountDTO: { - accountType: that.radio, - accountName: that.name, - bankName: that.bank, - bankCode: that.bankCode, - cardBookType: '1', - cardBookCode: that.bankId, - isAutoPay: this.isAutoPay == '0' ? '1' : '', - isAutoRenewal: this.isRenew == '0' ? '1' : '' + orderDTO: { + orderInfoDTO: { + orderNo: window.localStorage.getItem('orderNo') + }, + orderAccountDTO: { + accountType: that.radio, + accountName: that.name, + bankName: that.bank, + bankCode: that.bankCode, + cardBookType: '1', + cardBookCode: that.bankId, + isAutoPay: this.isAutoPay == '0' ? '1' : '', + isAutoRenewal: '0' + } + } + } + } else { + // 不垫付 不续保 + data = { + orderType: 'ACCOUNT_ORDER', + + orderDTO: { + orderInfoDTO: { + orderNo: window.localStorage.getItem('orderNo') + }, + orderAccountDTO: { + accountType: that.radio, + accountName: that.name, + bankName: that.bank, + bankCode: that.bankCode, + cardBookType: '1', + cardBookCode: that.bankId, + isAutoPay: this.isAutoPay == '0' ? '1' : '', + isAutoRenewal: this.isRenew == '0' ? '1' : '' + } } } } diff --git a/src/views/ebiz/sale/AddBeneficiaryInfo.vue b/src/views/ebiz/sale/AddBeneficiaryInfo.vue index 4bad1ec85..d9fd7b325 100644 --- a/src/views/ebiz/sale/AddBeneficiaryInfo.vue +++ b/src/views/ebiz/sale/AddBeneficiaryInfo.vue @@ -62,7 +62,7 @@ ref="birthday" :readonly="isInsured" > - + > --> - - --> + +
同投保人
- - --> + + - - +
@@ -202,7 +211,8 @@ import CustomerPicker from '@/components/ebiz/customer/CustomerPicker' import idNoCheck from '@/assets/js/utils/idNoCheck' import { idToData } from './js/verification' import { selectComp } from './js/methods' -let relationToInsured = [{ id: 2, text: '配偶' }, { id: 3, text: '父母' }, { id: 4, text: '子女' }, { id: 5, text: '其他' }] +// let relationToInsured = [{ id: 2, text: '配偶' }, { id: 3, text: '父母' }, { id: 4, text: '子女' }, { id: 5, text: '其他' }] +let relationToInsured = [{ id: 2, text: '配偶' }, { id: 3, text: '父母' }, { id: 4, text: '子女' }] export default { name: 'insuredInfo', @@ -250,6 +260,7 @@ export default { certiexpiredateRequired: true, //证件截止日期是否需要校验 certiexpiredateShow: true, //证件截止日期是否可以选择 marriage: '', + isRequired: '', //长期前是否有* userInfo: { name: '', sex: '0', @@ -257,20 +268,20 @@ export default { birthday: '', idType: '1', //证件类型 idNo: '', //证件号码 - certificateValidate: '', //证件起始日期 + // certificateValidate: '', //证件起始日期 certiexpiredate: '', //证件到期时间 effectiveDateType: false, //是否长期 asAppntAddress: false, //同投保人地址 occupationCode: '', occupationName: '', - mobile: '', + // mobile: '', workcompany: '', //工作单位 village: '', - province: '', - city: '', - area: '', + // province: '', + // city: '', + // area: '', fIncome: '', - email: '', + // email: '', bnfOrder: '1', //受益顺序 bnfLot: '', //受益比例 bnfFlag: '', @@ -395,7 +406,8 @@ export default { ;[this.userInfo.nativeplace, this.nativeplace] = [value.id, value.text] } else if (this.pickerType == '2') { this.idLimit = false - this.userInfo.idNo = this.userInfo.certificateValidate = this.userInfo.certiexpiredate = this.userInfo.birthday = '' + // this.userInfo.idNo = this.userInfo.certificateValidate = this.userInfo.certiexpiredate = this.userInfo.birthday = '' + this.userInfo.idNo = this.userInfo.certiexpiredate = this.userInfo.birthday = '' this.userInfo.sex = '0' this.effectiveDateTypeAble = false console.log(value.id) @@ -435,10 +447,10 @@ export default { console.log(this.userInfo) setTimeout(() => { - this.userInfo.city = insuredInfo.homeCity //家庭市 - this.userInfo.area = insuredInfo.homeArea //家庭区 - this.userInfo.province = insuredInfo.homeProvince //家庭省 - this.areaName = getAreaName([{ code: insuredInfo.homeProvince }, { code: insuredInfo.homeCity }, { code: insuredInfo.homeArea }]) //家庭地址 + // this.userInfo.city = insuredInfo.homeCity //家庭市 + // this.userInfo.area = insuredInfo.homeArea //家庭区 + // this.userInfo.province = insuredInfo.homeProvince //家庭省 + // this.areaName = getAreaName([{ code: insuredInfo.homeProvince }, { code: insuredInfo.homeCity }, { code: insuredInfo.homeArea }]) //家庭地址 this.userInfo.village = insuredInfo.homeAddress //家庭详细地址 }, 0) @@ -481,24 +493,24 @@ export default { //证件起始截止日期 onDateConfirm(val, type) { switch (type) { - case '0': - { - //证件起始日期 - //如果录入日期早于出生日期或晚于当前日期 - if (Date.parse(val) > Date.parse(new Date()) || Date.parse(val) < Date.parse(this.userInfo.birthday)) { - this.userInfo.certificateValidate = '' - this.$refs.certificateValidate.date = '' - return this.$toast('证件起始日期填写错误') - } + // case '0': + // { + // //证件起始日期 + // //如果录入日期早于出生日期或晚于当前日期 + // if (Date.parse(val) > Date.parse(new Date()) || Date.parse(val) < Date.parse(this.userInfo.birthday)) { + // this.userInfo.certificateValidate = '' + // this.$refs.certificateValidate.date = '' + // return this.$toast('证件起始日期填写错误') + // } - // 计算年龄 - // 长期按钮是否禁用 - if (this.userInfo.idType == '1') { - let age = utilsAge.getAge(this.userInfo.birthday, new Date()) - this.effectiveDateTypeAble = age <= 45 - } - } - break + // // 计算年龄 + // // 长期按钮是否禁用 + // if (this.userInfo.idType == '1') { + // let age = utilsAge.getAge(this.userInfo.birthday, new Date()) + // this.effectiveDateTypeAble = age <= 45 + // } + // } + // break case '1': { //证件截止日期 @@ -576,22 +588,22 @@ export default { this.userInfo.birthday = data.birthday //出生日期 this.userInfo.idType = data.customerIdType //证件类型 this.userInfo.idNo = data.customerIdNumber //证件号码 - this.userInfo.certificateValidate = data.idEffectStartDate //证件起始日期 + // this.userInfo.certificateValidate = data.idEffectStartDate //证件起始日期 this.userInfo.certiexpiredate = data.idEffectEndDate //证件截止日期 this.userInfo.effectiveDateType = data.idEffectEndDate == '9999-01-01' //是否长期 this.userInfo.occupationCode = data.occupationCode //职业类别编码 this.userInfo.occupationName = data.occupationName //职业类别名称 this.userInfo.lifeGrade = data.lifeGrade //寿险等级 this.userInfo.healthGrade = data.healthGrade //健康等级 - this.userInfo.mobile = data.customerPhone //移动电话 - this.userInfo.email = data.email //电子邮箱 + // this.userInfo.mobile = data.customerPhone //移动电话 + // this.userInfo.email = data.email //电子邮箱 this.userInfo.province = data.homeProvince //家庭省 this.userInfo.city = data.homeCity //家庭市 this.userInfo.area = data.homeArea //家庭区 this.userInfo.village = data.homeAddress //家庭详细地址 - if (data.homeProvince.length) { - this.areaName = getAreaName([{ code: data.homeProvince }, { code: data.homeCity }, { code: data.homeArea }]) //家庭地址 - } + // if (data.homeProvince.length) { + // this.areaName = getAreaName([{ code: data.homeProvince }, { code: data.homeCity }, { code: data.homeArea }]) //家庭地址 + // } //计算年龄 let age = utilsAge.getAge(this.userInfo.birthday, new Date()) // 长期按钮是否禁用 @@ -841,16 +853,20 @@ export default { //勾选长期状态时,证件截止日期置空 if (val) { this.userInfo.certiexpiredate = '' + this.isRequired = false + this.idLimit = true this.certiexpiredateRequired = false } else { this.certiexpiredateRequired = true + this.isRequired = true + this.idLimit = false } }, //获取身份证扫描信息 getIdentityInfo(data) { console.log(data) if (data.name && data.name != '待识别') { - this.userInfo.certificateValidate = data.startDate + // this.userInfo.certificateValidate = data.startDate this.userInfo.certiexpiredate = data.endDate this.userInfo.name = data.name this.userInfo.idNo = data.idNo @@ -891,6 +907,16 @@ export default { this.effectiveDateTypeAble = idToData(val).age < 45 this.userInfo.birthday = idToData(val).birthday this.userInfo.sex = idToData(val).sex + if (idToData(val).age >= 45) { + this.idLimit = true + this.isRequired = false + this.userInfo.effectiveDateType = true + this.effectiveDateTypeAble = true + } else { + this.idLimit = false + this.isRequired = true + this.userInfo.effectiveDateType = false + } //如果选择户口本 // if (this.userInfo.idType == '2') { // let exipreDate = Date.parse(this.userInfo.birthday) + Date.parse('1985-12-31') diff --git a/src/views/ebiz/sale/AttachmentManagement.vue b/src/views/ebiz/sale/AttachmentManagement.vue index 431cb9698..b09822690 100644 --- a/src/views/ebiz/sale/AttachmentManagement.vue +++ b/src/views/ebiz/sale/AttachmentManagement.vue @@ -1,6 +1,25 @@ @@ -49,7 +53,7 @@ export default { // 保融收银台返回的支付流水号 paySeqNo: '', // 接口返回数据前,不做页面渲染 - isReady: false, + isReady: true, // 是否已重新获取支付状态。(首次进入本页,立即查询支付结果。如果是‘支付中’,两秒后再次(最后一次)再次获取一次支付状态。) isReloaded: false, // 结果原因 @@ -130,6 +134,19 @@ export default { path: '/sale/payMent' } }) + }, + //更换卡号 + changeCard() { + localStorage.setItem('changeCard', true) + this.$jump({ + flag: 'h5', + extra: { + url: location.origin + '/#/sale/AccountInformation' + }, + routerInfo: { + path: '/sale/AccountInformation' + } + }) } }, mounted() { @@ -142,11 +159,11 @@ export default { } this.paySeqNo = this.$route.query.RdSeq - if (!this.paySeqNo) { - this.$toast({ message: '参数错误,缺少支付流水号‘RdSeq’查询参数', duration: 5000 }) - } else { - this.queryPayState() - } + // if (!this.paySeqNo) { + // this.$toast({ message: '参数错误,缺少支付流水号‘RdSeq’查询参数', duration: 5000 }) + // } else { + // this.queryPayState() + // } }, beforeRouteLeave(to, from, next) { document.body.style.backgroundColor = '' diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue index 0bf173c38..0dbae79af 100644 --- a/src/views/ebiz/sale/SignatureConfirmation.vue +++ b/src/views/ebiz/sale/SignatureConfirmation.vue @@ -18,7 +18,6 @@
-
@@ -27,14 +26,23 @@

以下内容需要您按照顺序阅读并签字确认:

-
-

{{ item.documentCode == '1' ? '需阅读' : '需签署' }}

+
+

需阅读

- {{ item.documentName }} - - + {{ appntSign.documentName }} +

+
+
+

{{ item.documentCode == '1' ? '需阅读' : '需签署' }}

+

+ {{ item.documentName }} + + +

+
+

点击【开始】按钮,进行相关操作

分享 @@ -53,7 +61,7 @@ size="normal" class="w150" plain - :disabled="appntSignStatus == '3'" + :disabled="changeCard ? appntSign.documentStatus == '1' : appntSignStatus == '3'" v-no-more-click="1000" @click="start_ocr(saleInsuredPersonInfo.relationToAppnt == '1' ? '2' : '0')" >开始 -
+
@@ -111,14 +119,23 @@ {{ appnt.name }}

以下内容需要您按照顺序阅读并签字确认:

-
-

{{ item.documentCode == '1' ? '需阅读' : '需签署' }}

+
+

需阅读

- {{ item.documentName }} - - + {{ appntSign.documentName }} +

+
+
+

{{ item.documentCode == '1' ? '需阅读' : '需签署' }}

+

+ {{ item.documentName }} + + +

+
+

点击【开始】按钮,进行相关操作

开始
-
- 提交 +
+
+ 支付 +
+
+
+
+ 提交 +
@@ -245,7 +276,8 @@ export default { idcardNumber: '' }, appntSignStatus: '', //投保人电子签名状态 - insuredSignStatus: '' //被保人电子签名状态 + insuredSignStatus: '', //被保人电子签名状态 + changeCard: localStorage.changeCard } }, methods: { @@ -261,7 +293,9 @@ export default { window.localStorage.setItem('orderNo', this.$route.query.orderNo) window.localStorage.setItem('relationToAppnt', this.$route.query.relationToAppnt) window.localStorage.setItem('productCode', this.$route.query.productCode) - + if (this.$route.query.changeCard && this.$route.query.changeCard != 'undefined') { + localStorage.setItem('changeCard', true) + } if (this.$route.query.signInvalid) { sessionStorage.setItem('signInvalid', this.$route.query.signInvalid) } @@ -279,17 +313,27 @@ export default { } this.airSign = sessionStorage.getItem('airSign') this.shareCode = sessionStorage.getItem('shareCode') + this.changeCard = localStorage.getItem('changeCard') this.relationToAppnt = this.$route.query.relationToAppnt this.isShow = false this.getOrderDetail().then(() => { // console.log('this.appntSignStatus', this.appntSignStatus) // console.log('this.appntSignStatus', this.appntSignStatus) - if (this.appntSignStatus == '3' && sessionStorage.getItem('shareCode') == '0' || this.appntSignStatus == '3' && sessionStorage.getItem('shareCode') == '2') { + console.log('this.appntSignStatus', this.appntSignStatus) + console.log('this.shareCode', this.shareCode) + console.log('this.changeCard', this.changeCard) + if ( + (this.appntSignStatus == '3' && sessionStorage.getItem('shareCode') == '0') || + (this.appntSignStatus == '3' && sessionStorage.getItem('shareCode') == '2') + ) { // this.$toast('签名成功,请联系业务员进行后续流程!') Dialog.alert({ title: '提示', message: '签名成功,请联系业务员进行后续流程!' }) } else if (this.insuredSignStatus == '3' && sessionStorage.getItem('shareCode') == '1') { Dialog.alert({ title: '提示', message: '签名成功,请联系业务员进行后续流程!' }) } + if (this.changeCard && this.appntSign.documentStatus == '1') { + Dialog.alert({ title: '提示', message: '确认完成,请联系业务员完成后续流程!' }) + } }) if (sessionStorage.shareCode == '1') { console.log('进来被保人') @@ -325,7 +369,7 @@ export default { window.localStorage.setItem('sign-val', val) window.localStorage.setItem('sign-appnt', JSON.stringify(that.appntSign)) if (val == '0' || val == '2') { - //idtype为身份证和年纪小于18岁跳过人脸识别 + //idtype不为身份证或年纪小于18岁跳过人脸识别 if (JSON.parse(this.$route.query.saleInsuredInfo).idType != '1' || JSON.parse(this.$route.query.saleInsuredInfo).age < '18') { that.goUrl() } else { @@ -387,23 +431,27 @@ export default { goUrl() { let that = this let path = '' - if (localStorage.productCode == 'GFRS_M0003') { - if (that.appntSign[0].documentStatus == 0) { - path = 'insuranceInformation' - } else if (that.appntSign[1].documentStatus == 2) { - path = 'productTip' - } else if (that.appntSign[2].documentStatus == 2) { - path = 'InsuranceTip' - } else if (that.appntSign[3].documentStatus == 2) { - path = 'SignatureOfElectronic' - } + if (that.changeCard) { + path = 'insuranceInformation' } else { - if (that.appntSign[0].documentStatus == 0) { - path = 'insuranceInformation' - } else if (that.appntSign[1].documentStatus == 2) { - path = 'InsuranceTip' - } else if (that.appntSign[2].documentStatus == 2) { - path = 'SignatureOfElectronic' + if (localStorage.productCode == 'GFRS_M0003') { + if (that.appntSign[0].documentStatus == 0) { + path = 'insuranceInformation' + } else if (that.appntSign[1].documentStatus == 2) { + path = 'productTip' + } else if (that.appntSign[2].documentStatus == 2) { + path = 'InsuranceTip' + } else if (that.appntSign[3].documentStatus == 2) { + path = 'SignatureOfElectronic' + } + } else { + if (that.appntSign[0].documentStatus == 0) { + path = 'insuranceInformation' + } else if (that.appntSign[1].documentStatus == 2) { + path = 'InsuranceTip' + } else if (that.appntSign[2].documentStatus == 2) { + path = 'SignatureOfElectronic' + } } } that.$jump({ @@ -461,12 +509,14 @@ export default { '&signInvalid=' + this.signInvalid + '&productCode=' + - localStorage.productCode + localStorage.productCode + + '&changeCard=' + + this.changeCard ) EWebBridge.webCallAppInJs('bridge', { flag: 'share', extra: { - title: `国富人寿电子投保单(${shareName})签字`, + title: this.changeCard ? '国富人寿修改银行卡号确认' : `国富人寿电子投保单(${shareName})签字`, content: '签字进行', url: location.origin + @@ -485,7 +535,9 @@ export default { '&signInvalid=' + this.signInvalid + '&productCode=' + - localStorage.productCode, + localStorage.productCode + + '&changeCard=' + + this.changeCard, img: this.$assetsUrl + 'images/logo.png' } }) @@ -589,6 +641,20 @@ export default { } }) }, + // 重新支付 + rePayMent() { + // 再次支付 salelist为 0 + localStorage.salelist = '0' + this.$jump({ + flag: 'h5', + extra: { + url: location.origin + '/#/sale/payMent' + }, + routerInfo: { + path: '/sale/payMent' + } + }) + }, // 获取消息和阅读状态 getOrderDetail() { let that = this @@ -627,31 +693,39 @@ export default { that.appnt = res.orderDTO.appntDTO that.date = res.orderDTO.orderInfoDTO.appntDateLabel res.orderDTO.ebizSignDTOS.map(item => { - if (item.signType == '0') { - that.appntSign.push(item) //投保 - that.addKey(item) - } else if (item.signType == '1') { - that.insuredSign.push(item) //被保 + if (item.signType == '0' || item.signType == '2') { + if (!localStorage.changeCard) { + if (item.documentCode != '5') { + that.appntSign.push(item) //投保 + that.addKey(item) + } + } else { + //阅读授权书 + if (item.documentCode == '5') { + that.appntSign = item //投保 + } + } } else { - that.appntSign.push(item) //本人 - that.addKey(item) - } - }) - //将投保人数组排序 - that.appntSign.sort(function(a, b) { - return a.key - b.key - }) - //获取投保和被保人电子投保单签字状态 - that.appntSign.map(item => { - if (item.documentCode == '2') { - that.appntSignStatus = item.documentStatus - } - }) - that.insuredSign.map(item => { - if (item.documentCode == '2') { - that.insuredSignStatus = item.documentStatus + that.insuredSign.push(item) //被保 } }) + if (!that.changeCard) { + //将投保人数组排序 + that.appntSign.sort(function(a, b) { + return a.key - b.key + }) + //获取投保和被保人电子投保单签字状态 + that.appntSign.map(item => { + if (item.documentCode == '2') { + that.appntSignStatus = item.documentStatus + } + }) + that.insuredSign.map(item => { + if (item.documentCode == '2') { + that.insuredSignStatus = item.documentStatus + } + }) + } resolve('success') } }) @@ -730,6 +804,7 @@ export default { }, mounted() { let that = this + document.title = this.changeCard ? '修改银行卡号确认' : '签名确认' // 初始化 that.init() // localStorage.orderNo = '19090510425500178912' diff --git a/src/views/ebiz/sale/js/methods.js b/src/views/ebiz/sale/js/methods.js index b2cda7c38..5bce49796 100644 --- a/src/views/ebiz/sale/js/methods.js +++ b/src/views/ebiz/sale/js/methods.js @@ -52,6 +52,7 @@ function closeBtn(that) { * @param {*} type 1 投保人 2 被保人 */ export function getIdentityInfo(that, data, type) { + console.log(data) // 正面 if (data.name && data.name != '待识别') { that.userInfo.name = data.name @@ -68,6 +69,8 @@ export function getIdentityInfo(that, data, type) { that.userInfo.certiexpiredate = `${data.endDate.substr(0, 4)}-${data.endDate.substr(5, 2)}-${data.endDate.substr(8, 2)}` // that.userInfo.certiexpiredate = `${data.endDate.substr(0, 4)}-${data.endDate.substr(4, 2)}-${data.endDate.substr(6, 2)}` that.effectiveDateTypeAble = true + that.idLimit = false + that.isRequired = true } else { // 勾选长期 that.userInfo.effectiveDateType = true @@ -75,6 +78,9 @@ export function getIdentityInfo(that, data, type) { that.effectiveDateTypeAble = false // 证件截止日期不需要校验 that.certiexpiredateRequired = false + //截止日期不可编辑 + that.idLimit = true + that.isRequired = false } } that.isScan = false