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,38 +69,40 @@
</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 class="mb20 ml20" v-if="item.impartCode == '2b' && showFlag && isShow"> <div v-if="im.impartType == 3 || im.impartType == 7 || im.impartType == 11">
<span>{{ item.impartCode + '.' + item.impartContent }}</span> <div class="mb20 ml20" v-if="item.impartCode == '2b' && showFlag && isShow">
</div> <span>{{ item.impartCode + '.' + item.impartContent }}</span>
<van-radio-group
v-model="item.impartAnswer"
class="flex mb10 pb10"
@change="change(item.isSelect, $event)"
v-validate="'required'"
data-vv-name="单选"
v-if="showFlag && isShow"
>
<van-radio name="0" class="mr150 ml70"></van-radio>
<van-radio name="1"></van-radio>
</van-radio-group>
<van-cell-group v-for="(it, ind) in item.questions" :key="ind">
<div v-if="it.extra && showFlag && isShow">
<van-field v-model="it.answer" placeholder="请输入" :label="it.questionContent" clearable v-validate="'required'" data-vv-name="答案" />
</div> </div>
</van-cell-group> <van-radio-group
<div v-if="item.show && showFlag && isShow"> v-model="item.impartAnswer"
class="flex mb10 pb10"
@change="change(item.isSelect, $event)"
v-validate="'required'"
data-vv-name="单选"
v-if="showFlag && isShow"
>
<van-radio name="0" class="mr150 ml70"></van-radio>
<van-radio name="1"></van-radio>
</van-radio-group>
<van-cell-group v-for="(it, ind) in item.questions" :key="ind"> <van-cell-group v-for="(it, ind) in item.questions" :key="ind">
<van-field <div v-if="it.extra && showFlag && isShow">
v-model="it.answer" <van-field v-model="it.answer" placeholder="请输入" :label="it.questionContent" clearable v-validate="'required'" data-vv-name="答案" />
placeholder="请输入" </div>
:label="it.questionContent"
clearable
v-validate="'required'"
data-vv-name="答案"
v-if="!it.extra"
/>
</van-cell-group> </van-cell-group>
<div v-if="item.show && showFlag && isShow">
<van-cell-group v-for="(it, ind) in item.questions" :key="ind">
<van-field
v-model="it.answer"
placeholder="请输入"
:label="it.questionContent"
clearable
v-validate="'required'"
data-vv-name="答案"
v-if="!it.extra"
/>
</van-cell-group>
</div>
</div> </div>
</div> </div>
</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,19 +302,21 @@ export default {
}) })
}) })
} }
if (impartCode == '2a') { if (impartType == '3' || impartType == '7' || impartType == '11') {
if (val == '0') { if (impartCode == '2a') {
this.showFlag = true if (val == '0') {
} else { this.showFlag = true
this.showFlag = false } else {
} this.showFlag = false
that.impartDTOS.map(it => { }
it.impartItemDTOS.map(itm => { that.impartDTOS.map(it => {
if (itm.impartCode == '2b') { it.impartItemDTOS.map(itm => {
itm.impartAnswer = '' if (itm.impartCode == '2b') {
} itm.impartAnswer = ''
}
})
}) })
}) }
} }
}, },
formatDateTime() { formatDateTime() {