hz/ebiz-h5
1
0
Fork 0
mirror of http://112.124.100.131/GFRS/ebiz-h5.git synced 2025-12-06 16:36:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

【FIX】解决冲突代码合并

Browse Source
This commit is contained in:
勾通
2025-10-30 17:26:53 +08:00
parent e3ff31bc61
commit 715f2747d7
9 changed files with 138 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/components/ebiz/sale/IndexBar.vue
View File

@@ -182,18 +182,18 @@ export default {
}) })
} }
} }
if(res.orderDTO.riskEvaluationDTO){ // if(res.orderDTO.riskEvaluationDTO){
if(res.orderDTO.riskEvaluationDTO.isShowEvaluationPoint == 1){ // if(res.orderDTO.riskEvaluationDTO.isShowEvaluationPoint == 1){
this.pageTitle.forEach(item=>{ // this.pageTitle.forEach(item=>{
if(item.pageNo == 6){ // if(item.pageNo == 6){
item.show = true // item.show = true
} // }
if(item.pageNo == 7){ // if(item.pageNo == 7){
item.show = true // item.show = true
} // }
}) // })
} // }
} // }
if(this.$route.query.orderNo) { if(this.$route.query.orderNo) {
this.projectName = res.orderDTO.ebizOrderGbcRelDTO.projectName this.projectName = res.orderDTO.ebizOrderGbcRelDTO.projectName
} }

25
src/views/ebiz/YB_agentSign/step3.vue
View File

@@ -516,26 +516,29 @@ export default {
}else if(orderStatus == '39'){ //险种信息保存成功, 跳到已选产品列表 }else if(orderStatus == '39'){ //险种信息保存成功, 跳到已选产品列表
url = '/common/selectedProduct?edit=1&orderNo='+orderNo url = '/common/selectedProduct?edit=1&orderNo='+orderNo
}else if(orderStatus == '40'){//告知信息保存成功, 跳到风险测评-- }else if(orderStatus == '40'){//告知信息保存成功, 跳到风险测评--
if( order.riskEvaluationDTO.isShowEvaluationPoint != '1'){ //if( order.riskEvaluationDTO.isShowEvaluationPoint != '1'){
if(order.universalRiskNotifyDTO && order.universalRiskNotifyDTO.isUniversalRiskNotifyShowPoint == '1'){ if(order.universalRiskNotifyDTO && order.universalRiskNotifyDTO.isUniversalRiskNotifyShowPoint == '1'){
url = '/sale/universalRiskNotifyingMessage?edit=1&orderNo='+orderNo url = '/sale/universalRiskNotifyingMessage?edit=1&orderNo='+orderNo
}else{ }else{
url = '/sale/AccountInformation?edit=1&orderNo='+orderNo url = '/sale/AccountInformation?edit=1&orderNo='+orderNo
} }
}else { //}
url = '/sale/answerPage?edit=1&orderNo='+orderNo // else {
} // url = '/sale/answerPage?edit=1&orderNo='+orderNo
// }
}else if(orderStatus == ''){//跳到投保人 }else if(orderStatus == ''){//跳到投保人
url = '/sale/insuredInfo?edit=1&orderNo='+orderNo url = '/sale/insuredInfo?edit=1&orderNo='+orderNo
}else if(orderStatus == '44'){//建议书转投保, 跳到投保人 }else if(orderStatus == '44'){//建议书转投保, 跳到投保人
url = '/sale/insuredInfo?edit=1&orderNo='+orderNo url = '/sale/insuredInfo?edit=1&orderNo='+orderNo
}else if(orderStatus == '62'){//风险测评保存成功, 跳到账户信息-- }
if(order.universalRiskNotifyDTO && order.universalRiskNotifyDTO.isUniversalRiskNotifyShowPoint != '1'){ // else if(orderStatus == '62'){//风险测评保存成功, 跳到账户信息--
url = '/sale/AccountInformation?edit=1&orderNo='+orderNo // if(order.universalRiskNotifyDTO && order.universalRiskNotifyDTO.isUniversalRiskNotifyShowPoint != '1'){
}else{ // url = '/sale/AccountInformation?edit=1&orderNo='+orderNo
url = '/sale/universalRiskNotifyingMessage?edit=1&orderNo='+orderNo // }else{
} // url = '/sale/universalRiskNotifyingMessage?edit=1&orderNo='+orderNo
}else if(orderStatus == '63'){//风险测评保存成功, 跳到账户信息-- // }
// }
else if(orderStatus == '63'){//风险测评保存成功, 跳到账户信息--
url = '/sale/AccountInformation?edit=1&orderNo='+orderNo url = '/sale/AccountInformation?edit=1&orderNo='+orderNo
} }
// switch (orderStatus) { // switch (orderStatus) {

16
src/views/ebiz/common/SelectedProduct.vue
View File

@@ -396,14 +396,14 @@
resultData = await orderDetail({ orderNo: this.$route.query.orderNo, isMerge: '1' }) resultData = await orderDetail({ orderNo: this.$route.query.orderNo, isMerge: '1' })
} }
if (resultData.result == 0) { if (resultData.result == 0) {
if( resultData.orderDTO ) { // if( resultData.orderDTO ) {
//判断是否显示风险测评tab // //判断是否显示风险测评tab
let updateAnswerType = resultData.orderDTO.riskEvaluationDTO.isShowEvaluationPoint =='1'?true:false // let updateAnswerType = resultData.orderDTO.riskEvaluationDTO.isShowEvaluationPoint =='1'?true:false
this.$store.commit('updateAnswerType', updateAnswerType ) // this.$store.commit('updateAnswerType', updateAnswerType )
// console.log(updateAnswerType,'updateAnswerType'); // // console.log(updateAnswerType,'updateAnswerType');
this.renovate = new Date().getTime() // this.renovate = new Date().getTime()
// }
} this.renovate = new Date().getTime()
let riskDTOLst let riskDTOLst
if (isProposal) { if (isProposal) {
this.$CacheUtils.setLocItem('saleInsuredInfo',JSON.stringify(resultData.content[0].appntDTO))//存储投保人信息 this.$CacheUtils.setLocItem('saleInsuredInfo',JSON.stringify(resultData.content[0].appntDTO))//存储投保人信息

36
src/views/ebiz/sale/AccountInformation.vue
View File

@@ -786,24 +786,24 @@ export default {
}) })
if (res.result == 0) { if (res.result == 0) {
this.renovate = new Date().getTime() this.renovate = new Date().getTime()
if(res.orderDTO.riskEvaluationDTO.isShowEvaluationPoint == '1'&&res.orderDTO.riskEvaluationDTO.totalScore == null){ // if(res.orderDTO.riskEvaluationDTO.isShowEvaluationPoint == '1'&&res.orderDTO.riskEvaluationDTO.totalScore == null){
Dialog.alert({ // Dialog.alert({
title: '提示', // title: '提示',
message: '您当前未完成测评，请完成后再进行后续操作', // message: '您当前未完成测评，请完成后再进行后续操作',
theme: 'round-button', // theme: 'round-button',
}).then(() => { // }).then(() => {
this.$jump({ // this.$jump({
flag: 'h5', // flag: 'h5',
extra: { // extra: {
url: location.origin + '/#/sale/answerPage', // url: location.origin + '/#/sale/answerPage',
}, // },
routerInfo: { // routerInfo: {
path: '/sale/answerPage' // path: '/sale/answerPage'
} // }
}) // })
// on close // // on close
}) // })
} // }
this.appntDTO = res.orderDTO.appntDTO this.appntDTO = res.orderDTO.appntDTO

36
src/views/ebiz/sale/AttachmentManagement.vue
View File

@@ -317,24 +317,24 @@ export default {
this.isEvalateNeed = res.orderDTO.orderInfoDTO.assessFlag==='1'?true:false this.isEvalateNeed = res.orderDTO.orderInfoDTO.assessFlag==='1'?true:false
console.log('this.isEvalateNeed',this.isEvalateNeed) console.log('this.isEvalateNeed',this.isEvalateNeed)
if (res.result == 0) { if (res.result == 0) {
if(res.orderDTO.riskEvaluationDTO.isShowEvaluationPoint == '1'&&res.orderDTO.riskEvaluationDTO.totalScore == null){ // if(res.orderDTO.riskEvaluationDTO.isShowEvaluationPoint == '1'&&res.orderDTO.riskEvaluationDTO.totalScore == null){
Dialog.alert({ // Dialog.alert({
title: '提示', // title: '提示',
message: '您当前未完成测评，请完成后再进行后续操作', // message: '您当前未完成测评，请完成后再进行后续操作',
theme: 'round-button', // theme: 'round-button',
}).then(() => { // }).then(() => {
this.$jump({ // this.$jump({
flag: 'h5', // flag: 'h5',
extra: { // extra: {
url: location.origin + '/#/sale/answerPage', // url: location.origin + '/#/sale/answerPage',
}, // },
routerInfo: { // routerInfo: {
path: '/sale/answerPage' // path: '/sale/answerPage'
} // }
}) // })
// on close // // on close
}) // })
} // }
//是投保人还是被保险人 //是投保人还是被保险人
localStorage.accountInformationRadio = res.orderDTO.orderAccountDTO.accountType localStorage.accountInformationRadio = res.orderDTO.orderAccountDTO.accountType
//投被保险人关系 //投被保险人关系

4
src/views/ebiz/sale/Beneficiary.vue
View File

@@ -72,7 +72,7 @@ export default {
bnfFlag: '0', // 受益人类型 bnfFlag: '0', // 受益人类型
bnfType: '0', // 0 身故受益人 1 身前受益人 bnfType: '0', // 0 身故受益人 1 身前受益人
salePageFlag: '4', salePageFlag: '4',
isShowEvaluationPoint:'0' //isShowEvaluationPoint:'0'
} }
}, },
created() { created() {
@@ -85,7 +85,7 @@ export default {
} else { } else {
getOrderDetail({ orderNo: this.$route.query.orderNo }).then(res => { getOrderDetail({ orderNo: this.$route.query.orderNo }).then(res => {
if (res.result == 0) { if (res.result == 0) {
this.isShowEvaluationPoint = res.orderDTO.riskEvaluationDTO.isShowEvaluationPoint //this.isShowEvaluationPoint = res.orderDTO.riskEvaluationDTO.isShowEvaluationPoint
this.renovate = new Date().getTime() this.renovate = new Date().getTime()
this.$utils.intLocalStorage(res) this.$utils.intLocalStorage(res)
this.type = res.orderDTO.orderInfoDTO.bnfFlag == '1' ? '2' : '1' //bnfFlag 0-法定受益人 1-指定受益人 this.type = res.orderDTO.orderInfoDTO.bnfFlag == '1' ? '2' : '1' //bnfFlag 0-法定受益人 1-指定受益人

46
src/views/ebiz/sale/List.vue
View File

@@ -589,15 +589,15 @@ export default {
}else if(orderStatus == '39'){ //险种信息保存成功, 跳到已选产品列表 }else if(orderStatus == '39'){ //险种信息保存成功, 跳到已选产品列表
url = '/common/selectedProduct?edit=1&orderNo='+orderNo+ '&branchType=' + this.branchType url = '/common/selectedProduct?edit=1&orderNo='+orderNo+ '&branchType=' + this.branchType
}else if(orderStatus == '40'){//告知信息保存成功, 跳到风险测评-- }else if(orderStatus == '40'){//告知信息保存成功, 跳到风险测评--
if( order.riskEvaluationDTO.isShowEvaluationPoint != '1'){ //if( order.riskEvaluationDTO.isShowEvaluationPoint != '1'){
if(order.universalRiskNotifyDTO && order.universalRiskNotifyDTO.isUniversalRiskNotifyShowPoint == '1'){ if(order.universalRiskNotifyDTO && order.universalRiskNotifyDTO.isUniversalRiskNotifyShowPoint == '1'){
url = '/sale/universalRiskNotifyingMessage?edit=1&orderNo='+orderNo url = '/sale/universalRiskNotifyingMessage?edit=1&orderNo='+orderNo
}else{ }else{
url = '/sale/AccountInformation?edit=1&orderNo='+orderNo url = '/sale/AccountInformation?edit=1&orderNo='+orderNo
} }
} else { // } else {
url = '/sale/answerPage?edit=1&orderNo=' + orderNo // url = '/sale/answerPage?edit=1&orderNo=' + orderNo
} // }
} else if(orderStatus == '' || (orderStatus == '66' && this.branchType == '14')){ } else if(orderStatus == '' || (orderStatus == '66' && this.branchType == '14')){
/* /*
*跳到投保人 *跳到投保人
@@ -606,15 +606,37 @@ export default {
url = '/sale/insuredInfo?edit=1&orderNo='+orderNo url = '/sale/insuredInfo?edit=1&orderNo='+orderNo
}else if(orderStatus == '44'){//建议书转投保, 跳到投保人 }else if(orderStatus == '44'){//建议书转投保, 跳到投保人
url = '/sale/insuredInfo?edit=1&orderNo='+orderNo url = '/sale/insuredInfo?edit=1&orderNo='+orderNo
}else if(orderStatus == '62'){//风险测评保存成功, 跳到账户信息--
if(order.universalRiskNotifyDTO && order.universalRiskNotifyDTO.isUniversalRiskNotifyShowPoint != '1'){
url = '/sale/AccountInformation?edit=1&orderNo='+orderNo
}else{
url = '/sale/universalRiskNotifyingMessage?edit=1&orderNo='+orderNo
}
} else if (orderStatus == '63') {//风险测评保存成功, 跳到账户信息--
url = '/sale/AccountInformation?edit=1&orderNo=' + orderNo
} }
// else if(orderStatus == '62'){//风险测评保存成功, 跳到账户信息--
// if(order.universalRiskNotifyDTO && order.universalRiskNotifyDTO.isUniversalRiskNotifyShowPoint != '1'){
// url = '/sale/AccountInformation?edit=1&orderNo='+orderNo
// }else{
// url = '/sale/universalRiskNotifyingMessage?edit=1&orderNo='+orderNo
// }
// }
else if (orderStatus == '63') {//风险测评保存成功, 跳到账户信息--
url = '/sale/AccountInformation?edit=1&orderNo=' + orderNo
//}
// else {
// url = '/sale/answerPage?edit=1&orderNo='+orderNo
// }
}
// else if(orderStatus == ''){//跳到投保人
// url = '/sale/insuredInfo?edit=1&orderNo='+orderNo
// }
else if(orderStatus == '44'){//建议书转投保, 跳到投保人
url = '/sale/insuredInfo?edit=1&orderNo='+orderNo
}
// else if(orderStatus == '62'){//风险测评保存成功, 跳到账户信息--
// if(order.universalRiskNotifyDTO && order.universalRiskNotifyDTO.isUniversalRiskNotifyShowPoint != '1'){
// url = '/sale/AccountInformation?edit=1&orderNo='+orderNo
// }else{
// url = '/sale/universalRiskNotifyingMessage?edit=1&orderNo='+orderNo
// }
// }
// else if(orderStatus == '63'){//风险测评保存成功, 跳到账户信息--
// url = '/sale/AccountInformation?edit=1&orderNo='+orderNo
// }
this.$jump({ this.$jump({
flag: 'h5', flag: 'h5',
extra: { extra: {

59
src/views/ebiz/sale/NotifyingMessage.vue
View File

@@ -200,7 +200,7 @@ export default {
let res= await getOrderDetail({ orderNo: this.$route.query.orderNo }) let res= await getOrderDetail({ orderNo: this.$route.query.orderNo })
if (res.result == 0) { if (res.result == 0) {
//投被保险人关系 //投被保险人关系
this.isShowEvaluationPoint = res.orderDTO.riskEvaluationDTO.isShowEvaluationPoint //this.isShowEvaluationPoint = res.orderDTO.riskEvaluationDTO.isShowEvaluationPoint
this.isUniversalRiskNotifyShowPoint = res.orderDTO.universalRiskNotifyDTO.isUniversalRiskNotifyShowPoint this.isUniversalRiskNotifyShowPoint = res.orderDTO.universalRiskNotifyDTO.isUniversalRiskNotifyShowPoint
this.renovate = new Date().getTime() this.renovate = new Date().getTime()
this.isExistAdditionalRisk = res.orderDTO.insuredDTOs[0].riskDTOLst.length > 1 ? true : false this.isExistAdditionalRisk = res.orderDTO.insuredDTOs[0].riskDTOLst.length > 1 ? true : false
@@ -685,7 +685,7 @@ export default {
return jobImpartDTO = item return jobImpartDTO = item
} }
}) })
console.log('zhenja',financeImpartDTO == {},financeImpartDTO == {})
if (financeImpartDTO == {}) { if (financeImpartDTO == {}) {
let data = { let data = {
orderType: 'IMPART_ORDER', orderType: 'IMPART_ORDER',
@@ -732,17 +732,19 @@ export default {
} }
}) })
} }
} else { }
that.$jump({ // else {
flag: 'h5', // console.log('jinrule')
extra: { // that.$jump({
url: location.origin + '/#/sale/answerPage?orderNo=' + this.$route.query.orderNo, // flag: 'h5',
}, // extra: {
routerInfo: { // url: location.origin + '/#/sale/answerPage?orderNo=' + this.$route.query.orderNo,
path: '/sale/answerPage?orderNo=' + this.$route.query.orderNo // },
} // routerInfo: {
}) // path: '/sale/answerPage?orderNo=' + this.$route.query.orderNo
} // }
// })
// }
// that.$jump({ // that.$jump({
// flag: 'h5', // flag: 'h5',
@@ -793,10 +795,10 @@ export default {
that.$jump({ that.$jump({
flag: 'h5', flag: 'h5',
extra: { extra: {
url: location.origin + '/#/sale/AccountInformation', url: location.origin + '/#/sale/AccountInformation?orderNo=' + this.$route.query.orderNo,
}, },
routerInfo: { routerInfo: {
path: '/sale/AccountInformation' path: '/sale/AccountInformation?orderNo=' + this.$route.query.orderNo
} }
}) })
} }
@@ -889,24 +891,25 @@ export default {
that.$jump({ that.$jump({
flag: 'h5', flag: 'h5',
extra: { extra: {
url: location.origin + '/#/sale/accountInformation', url: location.origin + '/#/sale/accountInformation?orderNo=' + this.$route.query.orderNo,
}, },
routerInfo: { routerInfo: {
path: '/sale/accountInformation' path: '/sale/accountInformation?orderNo=' + this.$route.query.orderNo
} }
}) })
} }
} else { }
that.$jump({ // else {
flag: 'h5', // that.$jump({
extra: { // flag: 'h5',
url: location.origin + '/#/sale/answerPage?orderNo=' + this.$route.query.orderNo, // extra: {
}, // url: location.origin + '/#/sale/accountInformation?orderNo=' + this.$route.query.orderNo,
routerInfo: { // },
path: '/sale/answerPage?orderNo=' + this.$route.query.orderNo // routerInfo: {
} // path: '/sale/accountInformation?orderNo=' + this.$route.query.orderNo
}) // }
} // })
// }
} else { } else {
this.$toast(res.resultMessage) this.$toast(res.resultMessage)
} }

1
src/views/ebiz/sale/questionEvaluate.vue
View File

@@ -17,6 +17,7 @@
<h5 class="fs18">{{questionInfo.question1Desc}}</h5> <h5 class="fs18">{{questionInfo.question1Desc}}</h5>
<h5 class="fs18">{{questionInfo.question2Desc}}</h5> <h5 class="fs18">{{questionInfo.question2Desc}}</h5>
<h5 class="fs18">{{questionInfo.question3Desc}}</h5> <h5 class="fs18">{{questionInfo.question3Desc}}</h5>
<h5 class="fs18">{{questionInfo.question4Desc}}</h5>
<h5 class="fs18">{{questionInfo.questionTailDesc}}</h5> <h5 class="fs18">{{questionInfo.questionTailDesc}}</h5>
</div> </div>
<div class="question-detail"> <div class="question-detail">