Skip to content

H
hls-xcmg-vue-app
Commit b509feae authored by 786817560's avatar 786817560
Browse files
Options

'解决冲突'

parents c9f3b534 0c987360
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 21 deletions
src/pages/contractInquire/contract-records.vue
View file @ b509feae
<!--
* @Author: your name
* @Date: 2019-10-31 09:49:57
* @LastEditTime: 2019-11-14 16:32:55
* @LastEditTime: 2019-11-15 10:42:26
* @LastEditors: Please set LastEditors
* @Description: 合同查询--记录
* @FilePath:
......@@ -213,6 +213,7 @@ export default {
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'HomePage') {
vm.selected = 'all'
vm.recordQuery()
}
})
......
src/pages/contractInquire/repay-plans.vue
View file @ b509feae
<!--
* @Author: your name
* @Date: 2019-10-31 09:49:57
* @LastEditTime: 2019-11-13 20:09:28
* @LastEditTime: 2019-11-15 09:40:02
* @LastEditors: Please set LastEditors
* @Description: 还款
* @FilePath:
......@@ -18,7 +18,7 @@
<div class="total">
<div class="sum">
<div>融资额</div>
<div>租金总额</div>
<p>{{ info.total_rental_sum | currency }}</p>
<img src="@/assets/contractInquire/num.png" alt="">
<h3><span>{{ info.lease_times }}</span>期</h3>
......
src/pages/contractSigning/contract-detail.vue
View file @ b509feae
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-11-13 17:20:21
* @LastEditTime: 2019-11-15 15:57:14
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -114,7 +114,7 @@
<div slot="name" class="aguremrnt-list">
<img src="@/assets/constractSigning/pack.png" alt="" class="pics">
<p class="second">农行代扣授权书</p>
<img src="@/assets/constractSigning/read.png" alt="" class="read">
<img :src="bankPic" alt="" class="read">
</div>
<div slot="content" class="in-all">
<div @click="entryInfo"><img src="@/assets/constractSigning/scan.png" alt=""></div>
......@@ -126,7 +126,7 @@
<div slot="name" class="aguremrnt-list">
<img src="@/assets/constractSigning/pack.png" alt="" class="pics">
<p class="second">租赁主合同</p>
<img src="@/assets/constractSigning/unread.png" alt="" class="read">
<img :src="leasePic" alt="" class="read">
</div>
<div slot="content" class="in-detail" @click="goContractContent('租赁主合同')"><img src="@/assets/constractSigning/detail.png" alt=""></div>
</item>
......@@ -134,7 +134,7 @@
<div slot="name" class="aguremrnt-list">
<img src="@/assets/constractSigning/pack.png" alt="" class="pics">
<p class="second">经销商担保协议</p>
<img src="@/assets/constractSigning/unread.png" alt="" class="read">
<img :src="agentPic" alt="" class="read">
</div>
<div slot="content" class="in-detail" @click="goContractContent('经销商担保协议')"><img src="@/assets/constractSigning/detail.png" alt=""></div>
</item>
......@@ -315,6 +315,12 @@ export default {
entry_info_flag: false,
faceListUpload: [], // 自拍照上传
auth_credit_flag: 'N', // 征信授权书确认状态
readed: require('@/assets/constractSigning/read.png'), // 已读
unRead: require('@/assets/constractSigning/unread.png'), // 未读
leasePic: '', // 租赁合同图片
agentPic: '', // 经销商担保协议图片
bankPic: '', // 农行代扣授权书图片
legalPic: '', // 法人授权书图片
}
},
computed: {},
......@@ -342,12 +348,16 @@ export default {
vm.bank_flag = false
vm.isConfirm = false
vm.ischecked = false
vm.confirm_note = '' // 审批意见
vm.num = 0 // 进入详情显示基本信息
vm.bp_name = vm.$route.params.item.bp_name
vm.user_bp_type = vm.$route.params.user_bp_type
vm.auth_credit_flag = vm.$route.params.item.auth_credit_flag // 征信授权书确认状态
vm.project_id = vm.$route.params.item.project_id
vm.confirm_id = vm.$route.params.item.confirm_id
vm.con_confirm_status = vm.$route.params.item.confirm_status
vm.agentPic = vm.unRead
vm.leasePic = vm.unRead
if (vm.$route.params.item.bp_class === 'NP') {
vm.bp_flag = false
} else {
......@@ -423,12 +433,12 @@ export default {
hlsPopup.showLongCenter('请拍照')
}
hlsUtil.openCamera(cameraoptions, success, error)
// this.confirmContractSign('', status)
// this.confirmContractSign('', status)
},
// 执行同意的逻辑(查询对应的身份证正面图片->人脸识别->确认签约)
async confirmContractSign (faceImg, status) {
let idCardImgUrl = await this.idCardImgUrlGet()
if(idCardImgUrl){
if (idCardImgUrl) {
this.faceIdentify(faceImg, idCardImgUrl, status)
}
},
......@@ -445,7 +455,7 @@ export default {
if (res.result === 'S' && res.info) {
let cardUrl = process.env.filePath + 'attachment_id=' + res.info.attachment_id + '&access_token=' + window.localStorage.access_token
return cardUrl
} else if(res.result === 'S' && !res.info){
} else if (res.result === 'S' && !res.info) {
hlsPopup.showLongCenter('未找到身份证照片')
return null
} else {
......@@ -477,7 +487,7 @@ export default {
}
},
})
} else{
} else {
hlsPopup.showLongCenter('比对失败,请正对自己拍照')
}
})
......@@ -509,7 +519,7 @@ export default {
},
// 图片保存
save_picture (list) {
// alert('list' + JSON.stringify(list))
// alert('list' + JSON.stringify(list))
let vm = this
if (list.length) {
// hlsPopup.showLoading('图片上传请稍候')
......@@ -530,7 +540,7 @@ export default {
if (list[j].filePath === res.response.filePath) {
list[j].attachment_id = res.response.attachment_id
vm.faceListUpload.push(list[j])
// alert('faceListUpload' + JSON.stringify(vm.faceListUpload))
// alert('faceListUpload' + JSON.stringify(vm.faceListUpload))
break
}
}
......@@ -655,6 +665,11 @@ export default {
name,
},
})
if (name === '经销商担保协议') {
setTimeout(() => { this.agentPic = this.readed }, 1000)
} else if (name === '租赁主合同') {
setTimeout(() => { this.leasePic = this.readed }, 1000)
}
},
// 跳转银行信息录入
entryInfo () {
......@@ -711,8 +726,10 @@ export default {
if (res.result === 'S') {
if (res.info.bank_full_name === ' ') {
vm.bank_flag = false
vm.bankPic = vm.unRead
} else {
vm.bank_flag = true
vm.bankPic = vm.readed
}
} else {
hlsPopup.showLongCenter(res.message)
......
src/pages/contractSigning/contract-repay-plan.vue
View file @ b509feae
<!--
* @Author: your name
* @Date: 2019-10-30 19:29:24
* @LastEditTime: 2019-11-13 20:07:38
* @LastEditTime: 2019-11-15 09:14:47
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -17,7 +17,7 @@
<div class="total">
<div class="sum">
<div>融资额</div>
<div>租金总额</div>
<p>{{ info.total_rental_sum|currency }}</p>
<img src="@/assets/contractInquire/num.png" alt="">
<h3><span>{{ info.lease_times }}期</span></h3>
......
src/pages/contractSigning/contract-signing.vue
View file @ b509feae
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-11-11 14:52:00
* @LastEditTime: 2019-11-15 09:09:02
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -108,6 +108,7 @@ export default {
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'MyInfo') {
vm.num = 1
vm.user_bp_type = vm.$route.params.user_bp_type
}
vm.contractList()
......
src/pages/distributorSign/contract-details.vue
View file @ b509feae
......@@ -2,7 +2,7 @@
* @Description: 合同详情
* @Author: your name
* @Date: 2019-09-25 15:38:21
* @LastEditTime: 2019-11-14 18:01:59
* @LastEditTime: 2019-11-15 15:41:08
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -185,7 +185,7 @@
<div slot="name" class="aguremrnt-list">
<img src="@/assets/distributorSign/gray.png" alt="" class="pics">
<p class="second">经销商担保协议</p>
<img src="@/assets/distributorSign/read.png" alt="" class="read">
<img :src="agentPic" alt="" class="read">
</div>
<div slot="content" class="in-detail" @click="goContractContent('经销商担保协议')"><img src="@/assets/constractSigning/detail.png" alt=""></div>
</item>
......@@ -224,6 +224,9 @@ export default {
faceListUpload: [], // 自拍照上传
confirm_note: '',
confirm_id: window.sessionStorage.getItem('confirm_id'),
agentPic: '', // 经销商担保协议图片
readed: require('@/assets/constractSigning/read.png'), // 已读
unRead: require('@/assets/constractSigning/unread.png'), // 未读
}
},
computed: {},
......@@ -242,7 +245,16 @@ export default {
}
},
},
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'ContractContent') {
vm.tabNum = 2
vm.agentPic = vm.readed
}
})
},
created () {
this.agentPic = this.unRead
this.confirm_status = window.sessionStorage.getItem('confirm_status')
if (this.bp_class === 'NP') {
this.bp_flag = false
......@@ -500,6 +512,9 @@ export default {
},
// 跳转合同详情
goContractContent (name) {
// if (name === '经销商担保协议') {
// setTimeout(() => { this.agentPic = this.readed }, 1000)
// }
this.$router.push({
name: 'ContractContent',
params: {
......
src/pages/myInfo/my-info.vue
View file @ b509feae
<!--
* @Author: your name
* @Date: 2019-11-07 17:48:53
* @LastEditTime: 2019-11-13 11:29:25
* @LastEditTime: 2019-11-15 15:56:28
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -128,6 +128,7 @@ export default {
user_bp_name: '',
user_bp_type: '',
signCount: '0',
carNum: '0',
confirmCount: '0',
vedioCount: '0',
productCount: '0',
......@@ -484,8 +485,8 @@ export default {
vm.$post(url, param).then(function (res) {
if (res.result === 'S') {
if ('info' in res) {
vm.signCount = res.info.con_sign_num
vm.confirmCount = res.info.con_confirm_num
vm.signCount = res.info.con_confirm_num
// vm.confirmCount = res.info.con_confirm_num
vm.productCount = res.info.collect_num
vm.carCount = res.info.car_confirm_num
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment