Merge branch 'feature/GFRS-775【0319】电投流程添加关连多个保单号功能' into dev

# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
This commit is contained in:
tian.guangyuan
2020-03-20 14:17:56 +08:00

View File

@@ -246,7 +246,16 @@
<!-- 只有万能险且只有建议书才展示 --> <!-- 只有万能险且只有建议书才展示 -->
<van-field class="pv10" v-if="item.hasPredictTransferPrem === '0'" v-model="item.predictTransferPrem" label="预计转入保费" placeholder="请输入" /> <van-field class="pv10" v-if="item.hasPredictTransferPrem === '0'" v-model="item.predictTransferPrem" label="预计转入保费" placeholder="请输入" />
<div class="flex justify-content-s pv10 border-bottom" v-if="isRelated && isFrom != 'proposal'"> <div class="flex justify-content-s pv10 border-bottom" v-if="isRelated && isFrom != 'proposal'">
<van-field v-model="policyNo" clearable label="关联保单" name="关联保单号" maxlength="20" placeholder="请输入保单号/投保单号" /> <van-field
v-model="policyNo"
clearable
label="关联保单"
name="关联保单号"
maxlength="380"
type="textarea"
autosize
placeholder="请输入保单号/投保单号,请使用'\'(反斜杠)隔开多个保单号/投保单号"
/>
</div> </div>
<div class="flex justify-content-s pv10 border-bottom prem"> <div class="flex justify-content-s pv10 border-bottom prem">
<span <span
@@ -1276,6 +1285,13 @@ export default {
} }
} }
} }
// 验证格式
if (this.isRelated && this.isFrom != 'proposal' && this.policyNo) {
let vl = /^[0-9\\]+$/.test(this.policyNo)
if (!vl) {
return this.$toast('关联保单的格式不正确')
}
}
//组装险种提交数据 //组装险种提交数据
let [mainRiskCode, riskDTOLst] = ['', []] let [mainRiskCode, riskDTOLst] = ['', []]