Merge branch 'feature/GFRS-693【待确定】自助入司流程优化(app端)' into dev

# Conflicts:
#	src/views/ebiz/agentEenter/AgentEenterBasicHealth.vue
This commit is contained in:
yuweiqi
2020-05-22 11:07:45 +08:00

View File

@@ -136,18 +136,36 @@ export default {
let showLst = dataItemLst.filter(itemC => {
return itemC.impartId == item.impartId && itemC.impartType == item.impartType
})
item.impartAnswer = showLst[0].impartAnswer
item.impartRemark = showLst[0].impartRemark
item.bigCode = 'A' + index + 1
if (item.itemDtoLst) {
item.itemDtoLst.map((it, index) => {
let showSubLst = showLst.filter(itemB => {
return itemB.impartNo == it.impartNo && itemB.impartType == it.impartType
if (showLst && showLst.length > 0) {
item.impartAnswer = showLst[0].impartAnswer
item.impartRemark = showLst[0].impartRemark
item.bigCode = 'A' + index + 1
if (item.itemDtoLst) {
item.itemDtoLst.map((it, index) => {
let showSubLst = showLst.filter(itemB => {
return itemB.impartNo == it.impartNo && itemB.impartType == it.impartType
})
if (showSubLst && showSubLst.length > 0) {
it.impartAnswer = showSubLst[0].impartAnswer
it.impartRemark = showSubLst[0].impartRemark
} else {
it.impartAnswer = ''
it.impartRemark = ''
}
it.smallCode = item.bigCode + index //添加小题目标识
})
it.impartAnswer = showSubLst[0].impartAnswer
it.impartRemark = showSubLst[0].impartRemark
it.smallCode = item.bigCode + index //添加小题目标识
})
}
} else {
item.impartAnswer = ''
item.impartRemark = ''
item.bigCode = 'A' + index + 1 //添加大标题标识
if (item.itemDtoLst) {
item.itemDtoLst.map((it, index) => {
it.impartAnswer = ''
it.impartRemark = ''
it.smallCode = item.bigCode + index //添加小题目标识
})
}
}
} else {
item.impartAnswer = ''