hz/ebiz-h5
1
0
Fork 0
mirror of http://112.124.100.131/GFRS/ebiz-h5.git synced 2025-12-23 02:56:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/GFRS-1455【待确定】电投流程删除部分字段' into dev

Browse Source
This commit is contained in:
li.kai
2020-07-02 18:04:04 +08:00
parent f40242605b 63451f9f28
commit f64bf5d432
2 changed files with 59 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/views/ebiz/sale/InsuredInfo.vue
View File

@@ -318,8 +318,8 @@
<van-field
v-model="homeName"
readonly
label="家庭地址"
name="家庭地址"
label="联系地址"
name="联系地址"
required
right-icon="arrow"
placeholder="请选择"
@@ -351,7 +351,7 @@
<!-- <van-popup v-model="areaShow" position="bottom">
<van-area :area-list="areaList" value="110101" @confirm="sureArea($event, '1')" @cancel="areaShow = false" />
</van-popup> -->
<!-- 家庭地址选择 -->
<!-- 联系地址选择 -->
<van-popup v-model="homeShow" position="bottom"
><van-area :area-list="areaLists" value="450000" @confirm="sureArea($event, '2')" @cancel="homeShow = false"
/></van-popup>
@@ -439,9 +439,9 @@ export default {
valueKey: 'text',
// census: '', //户籍
// areaName: '', //单位地址
homeName: '', //家庭地址
homeName: '', //联系地址
companyDefault: false, //设置公司地址为默认地址
homeDefault: false, //设置家庭地址为默认地址
homeDefault: false, //设置联系地址为默认地址
setDefaultAddress: false, //设为联系地址
sessionId: '', //后台返回的 id
effectiveDateTypeAble: false, //长期按钮是否禁用
@@ -548,7 +548,7 @@ export default {
{ code: res.orderDTO.appntDTO.homeProvince },
{ code: res.orderDTO.appntDTO.homeCity },
{ code: res.orderDTO.appntDTO.homeArea }
]) //获取家庭地址
]) //获取联系地址
// this.census = getAreaName([{ code: res.orderDTO.appntDTO.householdProvince }, { code: res.orderDTO.appntDTO.householdCity }]) //获取户籍
}
//------------------------专为桂企写死--begin---------------//
@@ -667,10 +667,7 @@ export default {
// this.columns = DataDictionary.degree
// break
case '4':
this.columns = [
{ id: 0, text: '有' },
{ id: 1, text: '无' }
]
this.columns = [{ id: 0, text: '有' }, { id: 1, text: '无' }]
break
case '5':
this.columns = DataDictionary.taxIdentity
@@ -926,7 +923,7 @@ export default {
// this.areaName = getAreaName([{ code: data.companyProvince }, { code: data.companyCity }, { code: data.companyArea }]) //单位地址
// }
if (data.homeProvince.length) {
this.homeName = getAreaName([{ code: data.homeProvince }, { code: data.homeCity }, { code: data.homeArea }]) //家庭地址
this.homeName = getAreaName([{ code: data.homeProvince }, { code: data.homeCity }, { code: data.homeArea }]) //联系地址
}
// 计算年龄
let age = utilsAge.getAge(this.userInfo.birthday, new Date())
@@ -1280,7 +1277,7 @@ export default {
// ;[this.userInfo.companyProvince, this.userInfo.companyCity, this.userInfo.companyArea] = [area[0].code, area[1].code, area[2].code]
// this.areaShow = false
// break
case '2': //家庭地址
case '2': //联系地址
this.homeName = getAreaName(area, 'new')
;[this.userInfo.homeProvince, this.userInfo.homeCity, this.userInfo.homeArea] = [area[0].code, area[1].code, area[2].code]
this.homeShow = false

73
src/views/ebiz/sale/InsuredPerson.vue
View File

@@ -300,9 +300,7 @@
v-model="userInfo.workcompany"
label="工作单位"
name="工作单位"
required
placeholder="无工作单位，请输入无"
v-validate="'required'"
maxlength="50"
clearable
:readonly="isAppnt"
@@ -343,7 +341,9 @@
</van-cell-group>
<!-- 家庭信息 -->
<van-cell-group class="mt5" v-if="!isScan">
<p style=" border-bottom: 1px solid #ebedf0" class=" fs15 fwb pl10 mt10 pv12">家庭信息</p>
<p style=" border-bottom: 1px solid #ebedf0" class=" fs15 fwb pl10 pr10 mt10 pv12">
家庭信息
</p>
<!-- <van-field
:value="userInfo.marriage | idToText('marriage')"
readonly
@@ -369,8 +369,8 @@
<van-field
v-model="homeName"
readonly
label="家庭地址"
name="家庭地址"
label="联系地址"
name="联系地址"
required
right-icon="arrow"
placeholder="请选择"
@@ -400,6 +400,9 @@
:readonly="isAppnt"
/> -->
<!-- <van-field v-model="userInfo.homePhone" label="家庭电话" name="家庭电话" placeholder="非必填" maxlength="13" clearable :readonly="isAppnt" /> -->
<div class="pl10 pt10 pb10 pr10 address fs14">
<van-checkbox v-model="withRootUser.value">同投保人</van-checkbox>
</div>
</van-cell-group>
<van-button type="danger" class="bottom-btn" @click="nextStep" v-if="!isScan" v-no-more-click="1000">下一步</van-button>
@@ -411,7 +414,7 @@
<van-popup v-model="areaShow" position="bottom">
<van-area :area-list="areaList" value="110101" @confirm="sureArea($event, '1')" @cancel="areaShow = false" />
</van-popup>
<!-- 家庭地址选择 -->
<!-- 联系地址选择 -->
<van-popup v-model="homeShow" position="bottom">
<van-area :area-list="areaLists" value="450000" @confirm="sureArea($event, '2')" @cancel="homeShow = false" />
</van-popup>
@@ -466,6 +469,10 @@ export default {
},
data() {
return {
withRootUser: {
load: false, //防止重复请求
value: false
},
isScan: false, //是否显示证件扫描组件
effectiveDateTypeAble: false, //长期按钮是否禁用
sexRadio: [
@@ -593,7 +600,7 @@ export default {
// this.sureArea([{ code: insuredInfo.householdProvince }, { code: insuredInfo.householdCity }], '3')
//单位地址
// this.sureArea([{ code: insuredInfo.companyProvince }, { code: insuredInfo.companyCity }, { code: insuredInfo.companyArea }], '1')
//家庭地址
//联系地址
this.sureArea([{ code: insuredInfo.homeProvince }, { code: insuredInfo.homeCity }, { code: insuredInfo.homeArea }], '2')
//是否长期
if (insuredInfo.effectiveDateType == 'false') {
@@ -645,7 +652,7 @@ export default {
// { code: insuredPersonInfo.companyArea }
// ])
// }
//家庭地址
//联系地址
if (insuredPersonInfo.homeProvince.length) {
this.homeName = getAreaName([
{ code: insuredPersonInfo.homeProvince },
@@ -667,7 +674,7 @@ export default {
// { code: saleInsuredPersonInfo.homeProvince },
// { code: saleInsuredPersonInfo.homeCity },
// { code: saleInsuredPersonInfo.homeArea }
// ]) //家庭地址
// ]) //联系地址
// }
}
} else {
@@ -775,10 +782,7 @@ export default {
} /*else if (pickerType == '3') {
this.columns = DataDictionary.degree
} */ else if (pickerType == '4') {
this.columns = [
{ id: 0, text: '有' },
{ id: 1, text: '无' }
]
this.columns = [{ id: 0, text: '有' }, { id: 1, text: '无' }]
} else if (pickerType == '5') {
this.columns = DataDictionary.taxIdentity
} /* else if (pickerType == '6') {
@@ -888,7 +892,7 @@ export default {
// this.sureArea([{ code: insuredInfo.householdProvince }, { code: insuredInfo.householdCity }], '3')
//单位地址
// this.sureArea([{ code: insuredInfo.companyProvince }, { code: insuredInfo.companyCity }, { code: insuredInfo.companyArea }], '1')
//家庭地址
//联系地址
this.sureArea([{ code: insuredInfo.homeProvince }, { code: insuredInfo.homeCity }, { code: insuredInfo.homeArea }], '2')
//是否长期
if (insuredInfo.effectiveDateType == 'false') {
@@ -1165,7 +1169,7 @@ export default {
// this.areaName = getAreaName([{ code: data.companyProvince }, { code: data.companyCity }, { code: data.companyArea }]) //单位地址
// }
if (data.homeProvince.length) {
this.homeName = getAreaName([{ code: data.homeProvince }, { code: data.homeCity }, { code: data.homeArea }]) //家庭地址
this.homeName = getAreaName([{ code: data.homeProvince }, { code: data.homeCity }, { code: data.homeArea }]) //联系地址
}
//计算年龄
let age = utilsAge.getAge(this.userInfo.birthday, new Date())
@@ -1189,12 +1193,13 @@ export default {
this.userInfo.occupationCode == '8000001'
) {
} else if (this.userInfo.workcompany.length < 6 && this.userInfo.workcompany.trim() != '无') {
await this.$dialog.confirm({
title: '提示',
message: '亲，您填写的工作单位过于简短哦~',
confirmButtonText: '继续填写',
cancelButtonText: '返回修改'
})
this.userInfo.workcompany = '无'
// await this.$dialog.confirm({
// title: '提示',
// message: '亲，您填写的工作单位过于简短哦~',
// confirmButtonText: '继续填写',
// cancelButtonText: '返回修改'
// })
}
// 计算年龄
let age = utilsAge.getAge(this.userInfo.birthday, new Date())
@@ -1537,7 +1542,7 @@ export default {
// ;[this.userInfo.companyProvince, this.userInfo.companyCity, this.userInfo.companyArea] = [area[0].code, area[1].code, area[2].code]
// this.areaShow = false
// break
case '2': //家庭地址
case '2': //联系地址
this.homeName = getAreaName(area)
;[this.userInfo.homeProvince, this.userInfo.homeCity, this.userInfo.homeArea] = [area[0].code, area[1].code, area[2].code]
this.homeShow = false
@@ -1617,7 +1622,7 @@ export default {
// case '1': //户籍
// this.censusShow = true
// break
case '2': //家庭地址
case '2': //联系地址
this.homeShow = true
break
case '3': //单位地址
@@ -1735,6 +1740,24 @@ export default {
this.timeId = null
this.countDown = 60
this.codeDisabled = false
},
watch: {
async 'withRootUser.value'(n) {
if (n) {
const rs = await getOrderDetail({ orderNo: window.localStorage.getItem('orderNo') })
this.homeName = getAreaName([
{ code: rs.orderDTO.appntDTO.homeProvince },
{ code: rs.orderDTO.appntDTO.homeCity },
{ code: rs.orderDTO.appntDTO.homeArea }
])
this.userInfo.homeProvince = rs.orderDTO.appntDTO.homeProvince
this.userInfo.homeCity = rs.orderDTO.appntDTO.homeCity
this.userInfo.homeArea = rs.orderDTO.appntDTO.homeArea
this.userInfo.homeAddress = rs.orderDTO.appntDTO.homeAddress
} else {
this.homeName = this.userInfo.homeAddress = ''
}
}
}
// watch: {
// 'userInfo.idNo': {
@@ -1759,5 +1782,9 @@ export default {
/deep/.van-checkbox {
margin-left: auto;
}
.address {
display: flex;
flex-direction: row-reverse;
}
}
</style>