Merge branch 'zhouna' into dev_1220

# Conflicts:
#	src/views/ebiz/sale/NotifyingMessage.vue
This commit is contained in:
zhouna
2019-12-20 19:09:17 +08:00

View File

@@ -42,7 +42,7 @@
<van-radio-group <van-radio-group
v-model="item.impartAnswer" v-model="item.impartAnswer"
class="flex mb10 pb10" class="flex mb10 pb10"
@change="change(item.isSelect, $event, item.impartCode)" @change="change(item.isSelect, $event, item.impartCode, im.impartType)"
v-validate="'required'" v-validate="'required'"
data-vv-name="单选" data-vv-name="单选"
> >
@@ -69,7 +69,8 @@
</div> </div>
</div> </div>
<div class="mt10 pb2" :class="{ special: !showFlag || !isShow }" v-else> <div class="mt10 pb2" :class="{ special: !showFlag || !isShow }" v-else>
<!-- 题目为2b --> <!-- 被保人题目为2b -->
<div v-if="im.impartType == 3 || im.impartType == 7 || im.impartType == 11">
<div class="mb20 ml20" v-if="item.impartCode == '2b' && showFlag && isShow"> <div class="mb20 ml20" v-if="item.impartCode == '2b' && showFlag && isShow">
<span>{{ item.impartCode + '.' + item.impartContent }}</span> <span>{{ item.impartCode + '.' + item.impartContent }}</span>
</div> </div>
@@ -104,6 +105,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</van-collapse-item> </van-collapse-item>
</van-collapse> </van-collapse>
</div> </div>
@@ -238,17 +240,6 @@ export default {
} }
}) })
} }
//投保人财务告知隐藏2b题目
if (item.impartType == 2 || item.impartType == 6 || item.impartType == 10) {
item.impartItemDTOS.map((items, index, array) => {
if (items.extra3) {
let obj = JSON.parse(items.extra3)
if (obj.age && obj.sex == '2') {
array.splice(index, 1, '')
}
}
})
}
//被保人财务告知添加判断 //被保人财务告知添加判断
if (item.impartType == 3 || item.impartType == 7 || item.impartType == 11) { if (item.impartType == 3 || item.impartType == 7 || item.impartType == 11) {
item.impartItemDTOS.map((items, index, array) => { item.impartItemDTOS.map((items, index, array) => {
@@ -256,7 +247,7 @@ export default {
let obj = JSON.parse(items.extra3) let obj = JSON.parse(items.extra3)
if (obj.age && obj.sex == '2') { if (obj.age && obj.sex == '2') {
//小于18岁显示 //小于18岁显示
if (that.saleInsuredPersonAge > obj.age) { if (that.saleInsuredPersonAge < obj.age) {
this.isShow = true this.isShow = true
} }
} }
@@ -266,7 +257,7 @@ export default {
}) })
//去除数组里面的空字符串 //去除数组里面的空字符串
that.impartDTOS.map(item => { that.impartDTOS.map(item => {
if (item.impartType == 0 || item.impartType == 4 || item.impartType == 2 || item.impartType == 6 || item.impartType == 10) { if (item.impartType == 0 || item.impartType == 4) {
let array = item.impartItemDTOS let array = item.impartItemDTOS
for (var i = 0; i < array.length; i++) { for (var i = 0; i < array.length; i++) {
if (array[i] == '' || array[i] == null || typeof array[i] == undefined) { if (array[i] == '' || array[i] == null || typeof array[i] == undefined) {
@@ -287,7 +278,7 @@ export default {
}) })
}, },
// 单选改变时候 // 单选改变时候
change(item, val, impartCode) { change(item, val, impartCode, impartType) {
// console.log(item) // console.log(item)
// console.log(val) // console.log(val)
let that = this let that = this
@@ -311,6 +302,7 @@ export default {
}) })
}) })
} }
if (impartType == '3' || impartType == '7' || impartType == '11') {
if (impartCode == '2a') { if (impartCode == '2a') {
if (val == '0') { if (val == '0') {
this.showFlag = true this.showFlag = true
@@ -325,6 +317,7 @@ export default {
}) })
}) })
} }
}
}, },
formatDateTime() { formatDateTime() {
var date = new Date() var date = new Date()