diff --git a/src/components/ebiz/sale/IndexBar.vue b/src/components/ebiz/sale/IndexBar.vue
index b51af313d..f7e04b840 100644
--- a/src/components/ebiz/sale/IndexBar.vue
+++ b/src/components/ebiz/sale/IndexBar.vue
@@ -182,18 +182,18 @@ export default {
})
}
}
- if(res.orderDTO.riskEvaluationDTO){
- if(res.orderDTO.riskEvaluationDTO.isShowEvaluationPoint == 1){
- this.pageTitle.forEach(item=>{
- if(item.pageNo == 6){
- item.show = true
- }
- if(item.pageNo == 7){
- item.show = true
- }
- })
- }
- }
+ // if(res.orderDTO.riskEvaluationDTO){
+ // if(res.orderDTO.riskEvaluationDTO.isShowEvaluationPoint == 1){
+ // this.pageTitle.forEach(item=>{
+ // if(item.pageNo == 6){
+ // item.show = true
+ // }
+ // if(item.pageNo == 7){
+ // item.show = true
+ // }
+ // })
+ // }
+ // }
if(this.$route.query.orderNo) {
this.projectName = res.orderDTO.ebizOrderGbcRelDTO.projectName
}
diff --git a/src/views/ebiz/YB_agentSign/step3.vue b/src/views/ebiz/YB_agentSign/step3.vue
index 56f47bb41..e0c3c3c5a 100644
--- a/src/views/ebiz/YB_agentSign/step3.vue
+++ b/src/views/ebiz/YB_agentSign/step3.vue
@@ -516,26 +516,29 @@ export default {
}else if(orderStatus == '39'){ //险种信息保存成功, 跳到已选产品列表
url = '/common/selectedProduct?edit=1&orderNo='+orderNo
}else if(orderStatus == '40'){//告知信息保存成功, 跳到风险测评--
- if( order.riskEvaluationDTO.isShowEvaluationPoint != '1'){
+ //if( order.riskEvaluationDTO.isShowEvaluationPoint != '1'){
if(order.universalRiskNotifyDTO && order.universalRiskNotifyDTO.isUniversalRiskNotifyShowPoint == '1'){
url = '/sale/universalRiskNotifyingMessage?edit=1&orderNo='+orderNo
}else{
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 == ''){//跳到投保人
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'){//风险测评保存成功, 跳到账户信息--
+ }
+ // 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
}
// switch (orderStatus) {
diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue
index b58ac6606..f88e2f2f4 100644
--- a/src/views/ebiz/common/SelectedProduct.vue
+++ b/src/views/ebiz/common/SelectedProduct.vue
@@ -396,14 +396,14 @@
resultData = await orderDetail({ orderNo: this.$route.query.orderNo, isMerge: '1' })
}
if (resultData.result == 0) {
- if( resultData.orderDTO ) {
- //判断是否显示风险测评tab
- let updateAnswerType = resultData.orderDTO.riskEvaluationDTO.isShowEvaluationPoint =='1'?true:false
- this.$store.commit('updateAnswerType', updateAnswerType )
- // console.log(updateAnswerType,'updateAnswerType');
- this.renovate = new Date().getTime()
-
- }
+ // if( resultData.orderDTO ) {
+ // //判断是否显示风险测评tab
+ // let updateAnswerType = resultData.orderDTO.riskEvaluationDTO.isShowEvaluationPoint =='1'?true:false
+ // this.$store.commit('updateAnswerType', updateAnswerType )
+ // // console.log(updateAnswerType,'updateAnswerType');
+ // this.renovate = new Date().getTime()
+ // }
+ this.renovate = new Date().getTime()
let riskDTOLst
if (isProposal) {
this.$CacheUtils.setLocItem('saleInsuredInfo',JSON.stringify(resultData.content[0].appntDTO))//存储投保人信息
diff --git a/src/views/ebiz/sale/AccountInformation.vue b/src/views/ebiz/sale/AccountInformation.vue
index c1797e46a..d0b4c1335 100644
--- a/src/views/ebiz/sale/AccountInformation.vue
+++ b/src/views/ebiz/sale/AccountInformation.vue
@@ -786,24 +786,24 @@ export default {
})
if (res.result == 0) {
this.renovate = new Date().getTime()
- if(res.orderDTO.riskEvaluationDTO.isShowEvaluationPoint == '1'&&res.orderDTO.riskEvaluationDTO.totalScore == null){
- Dialog.alert({
- title: '提示',
- message: '您当前未完成测评，请完成后再进行后续操作',
- theme: 'round-button',
- }).then(() => {
- this.$jump({
- flag: 'h5',
- extra: {
- url: location.origin + '/#/sale/answerPage',
- },
- routerInfo: {
- path: '/sale/answerPage'
- }
- })
- // on close
- })
- }
+ // if(res.orderDTO.riskEvaluationDTO.isShowEvaluationPoint == '1'&&res.orderDTO.riskEvaluationDTO.totalScore == null){
+ // Dialog.alert({
+ // title: '提示',
+ // message: '您当前未完成测评，请完成后再进行后续操作',
+ // theme: 'round-button',
+ // }).then(() => {
+ // this.$jump({
+ // flag: 'h5',
+ // extra: {
+ // url: location.origin + '/#/sale/answerPage',
+ // },
+ // routerInfo: {
+ // path: '/sale/answerPage'
+ // }
+ // })
+ // // on close
+ // })
+ // }
this.appntDTO = res.orderDTO.appntDTO
diff --git a/src/views/ebiz/sale/AttachmentManagement.vue b/src/views/ebiz/sale/AttachmentManagement.vue
index 40276492a..dd8fde152 100644
--- a/src/views/ebiz/sale/AttachmentManagement.vue
+++ b/src/views/ebiz/sale/AttachmentManagement.vue
@@ -317,24 +317,24 @@ export default {
this.isEvalateNeed = res.orderDTO.orderInfoDTO.assessFlag==='1'?true:false
console.log('this.isEvalateNeed',this.isEvalateNeed)
if (res.result == 0) {
- if(res.orderDTO.riskEvaluationDTO.isShowEvaluationPoint == '1'&&res.orderDTO.riskEvaluationDTO.totalScore == null){
- Dialog.alert({
- title: '提示',
- message: '您当前未完成测评，请完成后再进行后续操作',
- theme: 'round-button',
- }).then(() => {
- this.$jump({
- flag: 'h5',
- extra: {
- url: location.origin + '/#/sale/answerPage',
- },
- routerInfo: {
- path: '/sale/answerPage'
- }
- })
- // on close
- })
- }
+ // if(res.orderDTO.riskEvaluationDTO.isShowEvaluationPoint == '1'&&res.orderDTO.riskEvaluationDTO.totalScore == null){
+ // Dialog.alert({
+ // title: '提示',
+ // message: '您当前未完成测评，请完成后再进行后续操作',
+ // theme: 'round-button',
+ // }).then(() => {
+ // this.$jump({
+ // flag: 'h5',
+ // extra: {
+ // url: location.origin + '/#/sale/answerPage',
+ // },
+ // routerInfo: {
+ // path: '/sale/answerPage'
+ // }
+ // })
+ // // on close
+ // })
+ // }
//是投保人还是被保险人
localStorage.accountInformationRadio = res.orderDTO.orderAccountDTO.accountType
//投被保险人关系
diff --git a/src/views/ebiz/sale/Beneficiary.vue b/src/views/ebiz/sale/Beneficiary.vue
index 6320c662f..58977d8b3 100644
--- a/src/views/ebiz/sale/Beneficiary.vue
+++ b/src/views/ebiz/sale/Beneficiary.vue
@@ -72,7 +72,7 @@ export default {
bnfFlag: '0', // 受益人类型
bnfType: '0', // 0 身故受益人 1 身前受益人
salePageFlag: '4',
- isShowEvaluationPoint:'0'
+ //isShowEvaluationPoint:'0'
}
},
created() {
@@ -85,7 +85,7 @@ export default {
} else {
getOrderDetail({ orderNo: this.$route.query.orderNo }).then(res => {
if (res.result == 0) {
- this.isShowEvaluationPoint = res.orderDTO.riskEvaluationDTO.isShowEvaluationPoint
+ //this.isShowEvaluationPoint = res.orderDTO.riskEvaluationDTO.isShowEvaluationPoint
this.renovate = new Date().getTime()
this.$utils.intLocalStorage(res)
this.type = res.orderDTO.orderInfoDTO.bnfFlag == '1' ? '2' : '1' //bnfFlag 0-法定受益人 1-指定受益人
diff --git a/src/views/ebiz/sale/List.vue b/src/views/ebiz/sale/List.vue
index 530047489..1a0597344 100644
--- a/src/views/ebiz/sale/List.vue
+++ b/src/views/ebiz/sale/List.vue
@@ -589,15 +589,15 @@ export default {
}else if(orderStatus == '39'){ //险种信息保存成功, 跳到已选产品列表
url = '/common/selectedProduct?edit=1&orderNo='+orderNo+ '&branchType=' + this.branchType
}else if(orderStatus == '40'){//告知信息保存成功, 跳到风险测评--
- if( order.riskEvaluationDTO.isShowEvaluationPoint != '1'){
+ //if( order.riskEvaluationDTO.isShowEvaluationPoint != '1'){
if(order.universalRiskNotifyDTO && order.universalRiskNotifyDTO.isUniversalRiskNotifyShowPoint == '1'){
url = '/sale/universalRiskNotifyingMessage?edit=1&orderNo='+orderNo
}else{
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 == '' || (orderStatus == '66' && this.branchType == '14')){
/*
*跳到投保人
@@ -606,15 +606,37 @@ export default {
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
}
+ // 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({
flag: 'h5',
extra: {
diff --git a/src/views/ebiz/sale/NotifyingMessage.vue b/src/views/ebiz/sale/NotifyingMessage.vue
index bdef975f3..df30c706a 100644
--- a/src/views/ebiz/sale/NotifyingMessage.vue
+++ b/src/views/ebiz/sale/NotifyingMessage.vue
@@ -200,7 +200,7 @@ export default {
let res= await getOrderDetail({ orderNo: this.$route.query.orderNo })
if (res.result == 0) {
//投被保险人关系
- this.isShowEvaluationPoint = res.orderDTO.riskEvaluationDTO.isShowEvaluationPoint
+ //this.isShowEvaluationPoint = res.orderDTO.riskEvaluationDTO.isShowEvaluationPoint
this.isUniversalRiskNotifyShowPoint = res.orderDTO.universalRiskNotifyDTO.isUniversalRiskNotifyShowPoint
this.renovate = new Date().getTime()
this.isExistAdditionalRisk = res.orderDTO.insuredDTOs[0].riskDTOLst.length > 1 ? true : false
@@ -685,7 +685,7 @@ export default {
return jobImpartDTO = item
}
})
-
+ console.log('zhenja',financeImpartDTO == {},financeImpartDTO == {})
if (financeImpartDTO == {}) {
let data = {
orderType: 'IMPART_ORDER',
@@ -732,17 +732,19 @@ export default {
}
})
}
- } else {
- that.$jump({
- flag: 'h5',
- extra: {
- url: location.origin + '/#/sale/answerPage?orderNo=' + this.$route.query.orderNo,
- },
- routerInfo: {
- path: '/sale/answerPage?orderNo=' + this.$route.query.orderNo
- }
- })
- }
+ }
+ // else {
+ // console.log('jinrule')
+ // that.$jump({
+ // flag: 'h5',
+ // extra: {
+ // url: location.origin + '/#/sale/answerPage?orderNo=' + this.$route.query.orderNo,
+ // },
+ // routerInfo: {
+ // path: '/sale/answerPage?orderNo=' + this.$route.query.orderNo
+ // }
+ // })
+ // }
// that.$jump({
// flag: 'h5',
@@ -793,10 +795,10 @@ export default {
that.$jump({
flag: 'h5',
extra: {
- url: location.origin + '/#/sale/AccountInformation',
+ url: location.origin + '/#/sale/AccountInformation?orderNo=' + this.$route.query.orderNo,
},
routerInfo: {
- path: '/sale/AccountInformation'
+ path: '/sale/AccountInformation?orderNo=' + this.$route.query.orderNo
}
})
}
@@ -889,24 +891,25 @@ export default {
that.$jump({
flag: 'h5',
extra: {
- url: location.origin + '/#/sale/accountInformation',
+ url: location.origin + '/#/sale/accountInformation?orderNo=' + this.$route.query.orderNo,
},
routerInfo: {
- path: '/sale/accountInformation'
+ path: '/sale/accountInformation?orderNo=' + this.$route.query.orderNo
}
})
}
- } else {
- that.$jump({
- flag: 'h5',
- extra: {
- url: location.origin + '/#/sale/answerPage?orderNo=' + this.$route.query.orderNo,
- },
- routerInfo: {
- path: '/sale/answerPage?orderNo=' + this.$route.query.orderNo
- }
- })
- }
+ }
+ // else {
+ // that.$jump({
+ // flag: 'h5',
+ // extra: {
+ // url: location.origin + '/#/sale/accountInformation?orderNo=' + this.$route.query.orderNo,
+ // },
+ // routerInfo: {
+ // path: '/sale/accountInformation?orderNo=' + this.$route.query.orderNo
+ // }
+ // })
+ // }
} else {
this.$toast(res.resultMessage)
}
diff --git a/src/views/ebiz/sale/questionEvaluate.vue b/src/views/ebiz/sale/questionEvaluate.vue
index 082854866..5ba8a26af 100644
--- a/src/views/ebiz/sale/questionEvaluate.vue
+++ b/src/views/ebiz/sale/questionEvaluate.vue
@@ -17,6 +17,7 @@
{{questionInfo.question1Desc}}
{{questionInfo.question2Desc}}
{{questionInfo.question3Desc}}
+ {{questionInfo.question4Desc}}
{{questionInfo.questionTailDesc}}