【FIX】列表合并冲突

This commit is contained in:
勾通
2025-10-13 19:59:26 +08:00
parent eeea5349d9
commit ecec1af4b2

View File

@@ -588,7 +588,11 @@ export default {
url = '/sale/AttachmentManagement?edit=1&orderNo=' + orderNo
}
}else if(orderStatus == '39'){ //险种信息保存成功, 跳到已选产品列表
url = '/common/selectedProduct?edit=1&orderNo='+orderNo + '&branchType=' + this.branchType
if(!assessQuestionnaireDtoList){
url = '/sale/questionEvaluate?edit=1&orderNo='+orderNo
}else{
url = '/common/selectedProduct?edit=1&orderNo='+orderNo+ '&branchType=' + this.branchType
}
}else if(orderStatus == '40'){//告知信息保存成功, 跳到风险测评--
if( order.riskEvaluationDTO.isShowEvaluationPoint != '1'){
if(order.universalRiskNotifyDTO && order.universalRiskNotifyDTO.isUniversalRiskNotifyShowPoint == '1'){