Merge branch 'feature/【建议书转投保】修改checke校验条件' into dev

# Conflicts:
#	src/views/ebiz/proposal/List.vue
This commit is contained in:
li.kai
2020-07-08 17:36:36 +08:00
2 changed files with 14 additions and 5 deletions

View File

@@ -80,8 +80,10 @@ export default {
//获取产品售卖权限列表 //获取产品售卖权限列表
getProductSellPermissionList(val, that) { getProductSellPermissionList(val, that) {
let flag = true let flag = true
const data = { productCodes: [val] }
if (Object.prototype.toString.call(val) === '[object Array]') data.productCodes = [...val]
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
productCheck({ productCodes: [val] }).then( productCheck(data).then(
res => { res => {
if (res.result == '0') { if (res.result == '0') {
if (JSON.stringify(res.content) == '{}') { if (JSON.stringify(res.content) == '{}') {

View File

@@ -262,17 +262,24 @@ export default {
}, },
//转投保 //转投保
async toInsurance(item) { async toInsurance(item) {
for(let i =0; i<item.insuredDTOs.length; i++ ){ console.log(item)
for (let i = 0; i < item.insuredDTOs.length; i++) {
if (item.insuredDTOs[i].mainRisk.length == '2') { if (item.insuredDTOs[i].mainRisk.length == '2') {
return Toast.fail('暂不支持组合产品转投保') return Toast.fail('暂不支持组合产品转投保')
} }
let flag = item.insuredDTOs[i].riskDTOLst.some(v => { let flag = true //所有类型都调用check
return v.riskCode == 'GFRS_M0024' const arr = []
item.insuredDTOs[i].riskDTOLst.map(item => {
arr.push(item.riskCode)
}) })
if (flag && (await riskRules.getProductSellPermissionList('GFRS_M0024', this))) { if (flag && (await riskRules.getProductSellPermissionList(arr, this))) {
return this.$toast('抱歉,您没有该产品的销售权限!') return this.$toast('抱歉,您没有该产品的销售权限!')
} }
} }
// let flag = item.insuredDTOs[0].riskDTOLst.some(v => {
// return v.riskCode == 'GFRS_M0024' //桂企单独调用check
// })
let params = { let params = {
proposalInfoDTO: { proposalInfoDTO: {