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

冲突解决

Browse Source
This commit is contained in:
邓晓坤
2019-10-16 15:08:24 +08:00
parent 3cfe97c6e9
commit 57ac60df9f
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/ebiz/sale/AttachmentManagement.vue
View File

@@ -14,7 +14,7 @@
<van-cell-group>
<van-field required :label="item.id == '2' ? `${item.text}户主页` : `${item.text}正面`" disabled />
</van-cell-group>
<div @click="test('fileListIdFront', saleInsuredInfo.idType)" class="flex align-items-e">
<div @click="test('', saleInsuredInfo.idType)" class="flex align-items-e">
<van-uploader
name="fileListIdFront"
v-model="fileListIdFront"
@@ -199,14 +199,21 @@
</div>
</div>
<!-- 受益人类型 -->
<<<<<<< Updated upstream
<div v-if="typebeneficiary == true">
=======
<div v-if="typebeneficiary">
>>>>>>> Stashed changes
<div class="flex bg-white p10 align-items-c">
<span>受益人附件</span>
</div>
<div class="m20 bg-white">
<<<<<<< Updated upstream
<van-cell-group>
<van-field required label="受益人附件上传" disabled />
</van-cell-group>
=======
>>>>>>> Stashed changes
<div @click="test('fileListtypebeneficiary', saleInsuredPersonInfo.idType)" class="flex">
<van-uploader
name="fileListtypebeneficiary"
@@ -841,7 +848,11 @@ export default {
subBusinessNo: '',
fileName: that.imgName
}
<<<<<<< Updated upstream
that.list.push(obj)
=======
that.list.push(obj)
>>>>>>> Stashed changes
}
// })
} else {
@@ -979,7 +990,7 @@ export default {
return false
} else {
let beneficiaryInfoList = JSON.parse(window.localStorage.getItem('beneficiaryInfo'))
if (JSON.parse(window.localStorage.getItem('trialList'))[0].prem >= 100000) {
if (JSON.parse(window.localStorage.getItem('trialList'))[0].prem >= 200000) {
for (let index = 0; index < beneficiaryInfoList.length; index++) {
if (beneficiaryInfoList[index].relationToInsured == 5) {
return true
@@ -1007,6 +1018,7 @@ export default {
saleInsuredInfoOther,
fileListtypebeneficiary
} = this
console.log(this)
return {
fileListIdFront,
fileListIdBack,