Skip to content

H
hls-xcmg-vue-app
Commit f3534b27 authored by Jennie Shi's avatar Jennie Shi
Browse files
Options

更新

parent ac23c3de
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 541 additions and 493 deletions
src/pages/carConfirm/confirm-detail.vue
View file @ f3534b27
......@@ -99,7 +99,19 @@
</item>
<item>
<div slot="name">租赁物数量</div>
<input slot="content" v-model="info.product_num" readonly placeholder="请输入租赁物数量" >
<input slot="content" v-model="info.product_num" readonly placeholder="暂无数据" >
</item>
<item>
<div slot="name">签约日期</div>
<input slot="content" v-model="info.sale_date" readonly placeholder="暂无数据" >
</item>
<item>
<div slot="name">首期付款日</div>
<input slot="content" v-model="info.lease_start_date" readonly placeholder="暂无数据" >
</item>
<item :showArrow="true" @click.native="goPlan">
<div slot="name">查看还款计划</div>
<input slot="content" readonly >
</item>
</list-item>
<div class="userInfo">设备清单</div>
......@@ -216,6 +228,8 @@ export default {
bp_agent_name: ' ',
product_plan_id_n: '',
product_code: '',
sale_date: '',
lease_start_date: '',
},
signMsg: '',
rentInfo: {
......@@ -276,6 +290,16 @@ export default {
}
})
},
goPlan () {
let vm = this
vm.$router.push({
name: 'ContractRepayPlan',
params: {
product_num: vm.info.product_num,
project_id: vm.project_id,
},
})
},
goContent (item, index) {
// 详情
// 合同状态更新保存
......@@ -355,7 +379,39 @@ export default {
},
async takePhonto () {
let vm = this
vm.goElectronicSign()
let flag = await this.signCheck()
if (flag) {
vm.hlsPopup.showLongCenter('已经验证过！')
return
}
let url = process.env.basePath + 'bp_query'
let param = {
bp_id: window.localStorage.bp_id,
}
hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(res => {
hlsPopup.hideLoading()
if (res.result === 'S') {
let data = res.lists[0]
cordova.plugins.IdCardPlugin.faceContrast({'idNum': data.id_card_no, 'idName': data.bp_name}, function (suc) {
let success = JSON.parse(suc)
if (success.code === 1) {
let filePath = JSON.stringify(success.message, '\\', null)
filePath = 'file:\/\/' + filePath.replace('\"', '')
filePath = filePath.substr(0, filePath.length - 1)
console.log('filePath ==== ' + filePath)
// 回调成功上传图片
vm.uploadImg(filePath)
vm.goElectronicSign()
}
}, function (reason) {
let error = JSON.parse(reason)
vm.hlsPopup.showLongCenter('认证失败: ' + error.message)
})
} else {
vm.hlsPopup.showLongCenter(res.message)
}
})
},
// 查看大图
showBigPicture (pic) {
......@@ -369,7 +425,7 @@ export default {
let vm = this
vm.faceListUpload = []
let obj = {
pkvalue: vm.$route.params.check_id,
pkvalue: vm.check_id,
source_type: 'PRJ_CDD_ITEM_CHECK',
picture: '',
filePath: img,
......@@ -402,13 +458,6 @@ export default {
}
})
},
// 执行同意的逻辑(查询对应的身份证正面图片->人脸识别->确认签约)
async confirmContractSign (faceImg) {
let idCardImgUrl = await this.idCardImgUrlGet()
if (idCardImgUrl) {
this.faceIdentify(faceImg, idCardImgUrl)
}
},
// 获取身份证照片
async idCardImgUrlGet () {
let vm = this
......@@ -435,48 +484,6 @@ export default {
return null
}
},
// 人脸比对
faceIdentify (faceImg, idCardImgUrl) {
let vm = this
let obj = {
fileUrl: faceImg,
idCardImgUrl: idCardImgUrl,
}
hlsPopup.showLoading('正在比对')
let url = process.env.ocrPath + '/baidu/ocr/face'
hlsUtil.baiduOcrFace(obj, url, function (res) {
hlsPopup.hideLoading()
if (res.success && res.result.result.score) {
// vm.save_picture(vm.faceListUpload)
let identifyScore = res.result.result.score.toFixed(0)
if (identifyScore >= 50) {
hlsPopup.showPopup({
title: '提示',
content: `识别分数为${identifyScore},请进行活体检测`,
onConfirm: () => {
// 进入活体检测页面
vm.goBodyCheck(vm.confirm_id)
},
})
} else {
hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
}
} else {
hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
}
})
},
goBodyCheck (confirm_id) {
// 活体检测
this.$refs.body.show()
/* this.$router.push({
name: 'BodyCheck',
params: {
check_id: this.$route.params.check_id,
confirm_id: confirm_id,
},
}) */
},
// 图片保存
save_picture (list) {
// alert('list' + JSON.stringify(list))
......@@ -625,6 +632,8 @@ export default {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.info = res.info
vm.info.sale_date ? vm.info.sale_date = vm.info.sale_date.substr(0, 10) : vm.info.sale_date = ''
vm.info.lease_start_date ? vm.info.lease_start_date = vm.info.lease_start_date.substr(0, 10) : vm.info.lease_start_date = ''
} else {
hlsPopup.showLongCenter(res.message)
}
......
src/pages/carConfirm/confirm-list.vue
View file @ f3534b27
......@@ -3,7 +3,7 @@
<h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
<span>发车确认</span>
<span>合同签订</span>
</div>
</h-header>
<Tab :title="text" @getTabNum="getTabNum" />
......
src/pages/contractCreate/creat-rent-info.vue
View file @ f3534b27
......@@ -131,37 +131,7 @@
<div slot="name" class="required">产品数量</div>
<input slot="content" v-model="saveInfo.product_num" :readonly="isReadOnly" placeholder="请输入产品数量">
</item>
<item v-if="isReadOnly" class="check">
<div slot="name" class="required">是否已发车</div>
<img v-if="saveInfo.if_sent_car" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!saveInfo.if_sent_car" slot="content" />
</item>
<item v-if="!isReadOnly" class="check" @click.native="saveInfo.if_sent_car=!saveInfo.if_sent_car">
<div slot="name" class="required">是否已发车</div>
<img v-if="saveInfo.if_sent_car" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!saveInfo.if_sent_car" slot="content" />
</item>
</list-item>
<div>
<div class="userInfo">租赁物信息<img v-if="!isReadOnly" src="@/assets/contractCreate/add.png" @click="downNum=true;resetRent()"></div>
<item-option v-for="(item,index) in leaseList" ref="underTake" :key="index" class="mySlider">
<list-item :item-height="68" @click.native="downNum=true;getRent(item.project_lease_item_id)">
<item>
<span slot="left-icon" class="left-icon">{{ index+1 }}</span>
<div slot="name">
租赁物信息<br >车辆型号
</div>
<div slot="content">
<input placeholder="" readonly >
<input v-model="item.vehicle_model" placeholder="" readonly >
</div>
</item>
</list-item>
<div slot="buttons">
<option-button v-if="!isReadOnly" type="delete" text @click.native="delete_release(item.project_lease_item_id,index)" />
</div>
</item-option>
</div>
<div class="userInfo">融资信息</div>
<div class="hint-info">
<img src="@/assets/contractCreate/hint.png">提示 以下为单个设备商务政策
......@@ -631,28 +601,6 @@ export default {
})
},
methods: {
delete_release (project_lease_item_id, index) {
hlsPopup.showConfirm({
title: '提示',
content: '您确认删除吗？',
onConfirm: (index2) => {
if (index2 === 1) {
let url = process.env.basePath + 'prj_leases_info_delete'
let param = {
project_lease_item_id: project_lease_item_id,
}
this.$post(url, param).then((res) => {
this.hlsPopup.hideLoading()
if (res.result === 'S') {
this.leaseList.splice(index, 1)
} else {
hlsPopup.showLongCenter(res.message)
}
})
}
},
})
},
// 查看大图
showBigPicture (pic) {
let vm = this
......@@ -661,35 +609,6 @@ export default {
width: '100%',
})
},
resetRent () {
this.rentInfo = {
project_lease_item_id: '',
project_id: window.localStorage.project_id,
frame_number: '',
engine: '',
vehicle_model: '',
certificate_number: '',
departure_date: '',
invoice_date: '',
}
},
getRent (id) {
let vm = this
let url = process.env.basePath + 'prj_leases_info_query'
let param = {
project_lease_item_id: id,
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
Object.assign(vm.rentInfo, res.info)
vm.getImg(id)
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
saveRent () {
let url = process.env.basePath + 'prj_leases_info_save'
if (this.rentInfo.frame_number === '') {
......
src/pages/contractCreate/my-contract.vue
View file @ f3534b27
......@@ -15,24 +15,24 @@
</h-header>
<div class="my-contractlist">
<div class="contract-item" @click="goSign()">
<p :class="{'content-wrap-class-width':signCount > 99, 'content-wrap-class':signCount < 99}" v-if="signCount > 0">{{ signCount > 99 ? '99+' : signCount }}</p>
<p v-if="signCount > 0" :class="{'content-wrap-class-width':signCount > 99, 'content-wrap-class':signCount < 99}">{{ signCount > 99 ? '99+' : signCount }}</p>
<img src="@/assets/myInfo/unSign.png" >
<span>租赁方案确认</span>
<span>融资方案确认</span>
</div>
<div class="contract-item" v-if="multipleRole == 'TENANT' || multipleRole == 'GUTA'" @click="goCarConfirm()">
<p :class="{'content-wrap-class-width':carCount > 99, 'content-wrap-class':carCount < 99}" v-if="carCount > 0">{{ carCount > 99 ? '99+' : carCount }}</p>
<div v-if="multipleRole == 'TENANT' || multipleRole == 'GUTA'|| user_bp_type == 'AGENT'" class="contract-item" @click="goCarConfirm()">
<p v-if="carCount > 0" :class="{'content-wrap-class-width':carCount > 99, 'content-wrap-class':carCount < 99}">{{ carCount > 99 ? '99+' : carCount }}</p>
<img src="@/assets/myInfo/carConfirm.png" >
<span>发车确认</span>
<span>合同签订</span>
</div>
<div class="contract-item" v-if="multipleRole == 'AGENT' || (multipleRole == 'OFFICE' || user_bp_type == 'OFFICE')" @click="goCreate()">
<div v-if="multipleRole == 'AGENT' || (multipleRole == 'OFFICE' || user_bp_type == 'OFFICE')" class="contract-item" @click="goCreate()">
<img src="@/assets/myInfo/contractCreate.png" >
<span>合同创建</span>
</div>
<div class="contract-item" v-if="multipleRole == 'GUTA'" @click="changeContract('GUTA')">
<div v-if="multipleRole == 'GUTA'" class="contract-item" @click="changeContract('GUTA')">
<img src="@/assets/myInfo/under.png" >
<span>我担保的合同</span>
</div>
<div class="contract-item" v-if="multipleRole == 'AGENT' || (multipleRole == 'OFFICE' || user_bp_type == 'OFFICE')" @click="goContract()">
<div v-if="multipleRole == 'AGENT' || (multipleRole == 'OFFICE' || user_bp_type == 'OFFICE')" class="contract-item" @click="goContract()">
<img src="@/assets/myInfo/agent.png" >
<span>我办理的合同</span>
</div>
......@@ -76,11 +76,11 @@ export default {
vm.$post(url, param).then(function (res) {
if (res.result === 'S') {
if ('info' in res) {
vm.signCount = res.info.con_confirm_num || 0 //待确认数量 数字 必输 待确认数量
vm.signCount = res.info.con_confirm_num || 0 // 待确认数量 数字 必输 待确认数量
vm.productCount = res.info.collect_num || 0 // 产品收藏数量 数字 必输 产品收藏数量
vm.carCount = res.info.car_confirm_num || 0 // 发车待确认数量 数字 必输 发车待确认数量
vm.faceSign = res.info.face_sign_num || 0 // 待面签数量 数字 必要 待面签数量
vm.prjSubmit = res.info.prj_submit_num || 0 // 待提交合同数量 数字 必要
vm.prjSubmit = res.info.prj_submit_num || 0 // 待提交合同数量 数字 必要
}
} else {
this.hlsPopup.showLongCenter(res.message)
......@@ -105,7 +105,7 @@ export default {
hlsPopup.showLongCenter('请先进行用户绑定')
}
},
// 进入发车确认
// 进入合同签订
goCarConfirm () {
if (this.bp_id) {
this.$router.push({
......
src/pages/contractSigning/contract-detail.vue
View file @ f3534b27
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime : 2019-12-26 12:08:25
* @LastEditors : Please set LastEditors
* @Description: In User Settings Edit
-->
<template>
<h-view id="contract-details" class="public-style">
<div v-show="isshow" class="all">
......@@ -25,7 +18,7 @@
<span>合同详情</span>
</div>
</h-header>
<div
<!-- <div
v-if="bookFlag"
class="myModal"
>
......@@ -39,7 +32,7 @@
<button v-if="!ischecked" style="background:rgba(56, 63, 69, 0.5)">同意</button>
<button v-if="ischecked" class="appro" style="background:#00469c" @click="confirm">同意</button>
</div>
</div>
</div> -->
<div class="tab-style">
<div :class="{'done':num === 0,'undone':num !== 0}" @click="num = 0;">
<img :src="num === 0?check1:uncheck1" >基本信息
......@@ -602,40 +595,44 @@ export default {
},
async takePhonto () {
let vm = this
let flag = await this.signCheck()
if (flag) {
vm.hlsPopup.showLongCenter('已经验证过！')
return
}
let url = process.env.basePath + 'bp_query'
let param = {
bp_id: window.localStorage.bp_id,
}
hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(res => {
hlsPopup.hideLoading()
if (res.result === 'S') {
let data = res.lists[0]
cordova.plugins.IdCardPlugin.faceContrast({'idNum': data.id_card_no, 'idName': data.bp_name}, function (suc) {
let success = JSON.parse(suc)
if (success.code === 1) {
let filePath = JSON.stringify(success.message, '\\', null)
filePath = 'file:\/\/' + filePath.replace('\"', '')
filePath = filePath.substr(0, filePath.length - 1)
console.log('filePath ==== ' + filePath)
// 回调成功上传图片
vm.uploadImg(filePath)
vm.goElectronicSign()
}
}, function (reason) {
let error = JSON.parse(reason)
vm.hlsPopup.showLongCenter('认证失败: ' + error.message)
})
} else {
vm.hlsPopup.showLongCenter(res.message)
}
})
vm.goElectronicSign()
},
// async takePhonto () {
// let vm = this
// let flag = await this.signCheck()
// if (flag) {
// vm.hlsPopup.showLongCenter('已经验证过！')
// return
// }
// let url = process.env.basePath + 'bp_query'
// let param = {
// bp_id: window.localStorage.bp_id,
// }
// hlsPopup.showLoading('请稍候')
// vm.hlsHttp.post(url, param).then(res => {
// hlsPopup.hideLoading()
// if (res.result === 'S') {
// let data = res.lists[0]
// cordova.plugins.IdCardPlugin.faceContrast({'idNum': data.id_card_no, 'idName': data.bp_name}, function (suc) {
// let success = JSON.parse(suc)
// if (success.code === 1) {
// let filePath = JSON.stringify(success.message, '\\', null)
// filePath = 'file:\/\/' + filePath.replace('\"', '')
// filePath = filePath.substr(0, filePath.length - 1)
// console.log('filePath ==== ' + filePath)
// // 回调成功上传图片
// vm.uploadImg(filePath)
// vm.goElectronicSign()
// }
// }, function (reason) {
// let error = JSON.parse(reason)
// vm.hlsPopup.showLongCenter('认证失败: ' + error.message)
// })
// } else {
// vm.hlsPopup.showLongCenter(res.message)
// }
// })
// },
// 图片上传
uploadImg (img) {
let vm = this
......
src/pages/contractSigning/contract-repay-plan.vue
View file @ f3534b27
<!--
* @Author: your name
* @Date: 2019-10-30 19:29:24
* @LastEditTime : 2019-12-26 16:47:28
* @LastEditors : Please set LastEditors
* @Description: In User Settings Edit
-->
<template>
<h-view id="repay-pland" class="public-style">
<h-header :proportion="[5,1,1]" class="bar-custom">
......@@ -93,10 +86,10 @@ export default {
watch: {},
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'ContractDetail' || from.name === 'CreateRentInfo') {
vm.product_num = vm.$route.params.product_num
vm.getInfo()
}
// if (from.name === 'ContractDetail' || from.name === 'CreateRentInfo') {
vm.product_num = vm.$route.params.product_num
vm.getInfo()
// }
})
next()
},
......@@ -151,22 +144,6 @@ export default {
}
})
},
// repayQuery () {
// let vm = this
// let url = $config.basePath + 'prd_repayment_plan'
// let param = {
// quotation_id: vm.$route.params.quotation_id,
// }
// vm.hlsPopup.showLoading('数据加载中')
// vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
// if (res.result === 'S') {
// vm.info = res.info
// } else {
// hlsPopup.showLongCenter(res.message)
// }
// })
// },
},
}
......
src/pages/contractSigning/contract-signing.vue
View file @ f3534b27
......@@ -3,7 +3,7 @@
<h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="$routeGo()">
<span>租赁方案确认</span>
<span>融资方案确认</span>
</div>
</h-header>
<div class="tab-style has-header">
......
src/pages/contractStart/add-car.vue
View file @ f3534b27
This diff is collapsed.
src/pages/distributorSign/contract-list.vue
View file @ f3534b27
......@@ -9,7 +9,7 @@
<h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="$routeGo()">
<span>租赁方案确认</span>
<span>融资方案确认</span>
</div>
</h-header>
<div class="tab-style has-header">
......
src/pages/functionCenter/function-list.vue
View file @ f3534b27
This diff is collapsed.
src/pages/myInfo/my-info.vue
View file @ f3534b27
......@@ -35,7 +35,7 @@
<div class="card-bottom">
<div v-if="((user_bp_type!=='TENANT')&&(user_bp_type!=='GUTA')&&(multipleRole!=='GUTA')&&(multipleRole!=='TENANT'))||multipleRole==='AGENT'" @click="goStart">
<img src="@/assets/myInfo/car.png" >
<p>发车申请</p>
<p>融资合同创建</p>
</div>
<div v-if="((user_bp_type==='TENANT')&&(multipleRole==='TENANT'))||(multipleRole==='TENANT')||((user_bp_type==='TENANT')&&(!multipleRole))" @click="changePay">
<img src="@/assets/myInfo/pay.png" >
......@@ -457,7 +457,7 @@ export default {
},
})
},
// 进入待签约功能，客户类型为经销商则进入经销商功能，非经销商则进入租赁方案确认
// 进入待签约功能，客户类型为经销商则进入经销商功能，非经销商则进入融资方案确认
goSign () {
if (this.bp_id) {
// if (this.user_bp_type === 'AGENT') {
......@@ -510,7 +510,7 @@ export default {
},
})
},
// 进入发车申请
// 进入融资合同创建
goStart () {
if (this.bp_id) {
this.$router.push({
......@@ -520,7 +520,7 @@ export default {
hlsPopup.showLongCenter('请先进行用户绑定')
}
},
// 进入发车确认
// 进入合同签订
goCarConfirm () {
if (this.bp_id) {
this.$router.push({
......
src/router/index.js
View file @ f3534b27
......@@ -52,7 +52,7 @@ import FinancDetails from '@/pages/distributorSign/financ-details' // 还款计
import FinancingTrial from '@/pages/financingTrial/financing-trial'
import FinancingDetails from '@/pages/financingTrial/financing-details' // 融资明细
import TrialRepayPlan from '@/pages/financingTrial/trial-repay-plan'
// 租赁方案确认
// 融资方案确认
import ContractSigning from '../pages/contractSigning/contract-signing'
import ContractDetail from '@/pages/ContractSigning/contract-detail'
import ContractContent from '@/pages/ContractSigning/contract-content'
......@@ -95,11 +95,11 @@ import ContractRepayment from '@/pages/contractRepayment/contract-repayment'
import RepayDetails from '@/pages/contractRepayment/repay-details'
import RepayPlan from '@/pages/contractRepayment/refund'
// 发车申请
// 融资合同创建
import StartList from '@/pages/contractStart/start-list'
import AddCar from '@/pages/contractStart/add-car'
// 发车确认
// 合同签订
import ConfirmDetail from '@/pages/carConfirm/confirm-detail'
import ConfirmList from '@/pages/carConfirm/confirm-list'
......@@ -256,12 +256,12 @@ export default new Router({
{path: '/financing-trial', component: FinancingTrial, name: 'FinancingTrial', meta: {keepAlive: true}},
{path: '/financing-details', component: FinancingDetails, name: 'FinancingDetails', meta: {keepAlive: true}},
{path: '/trial-repay-plan', component: TrialRepayPlan, name: 'TrialRepayPlan', meta: {keepAlive: true}},
// 租赁方案确认
// 融资方案确认
{path: '/contract-signing', component: ContractSigning, name: 'ContractSigning', meta: {keepAlive: false}},
{path: '/contract-detail', component: ContractDetail, name: 'ContractDetail', meta: {keepAlive: true}},
{path: '/contract-content', component: ContractContent, name: 'ContractContent', meta: {keepAlive: true}},
{path: '/entry-info', component: EntryInfo, name: 'EntryInfo', meta: {keepAlive: true}},
{path: '/contract-repay-plan', component: ContractRepayPlan, name: 'ContractRepayPlan', meta: {keepAlive: true}},
{path: '/contract-repay-plan', component: ContractRepayPlan, name: 'ContractRepayPlan', meta: {keepAlive: false}},
{path: '/electronic-sign', component: ElectronicSign, name: 'ElectronicSign', meta: {keepAlive: false}},
// 首付款支付
{path: '/first-pay', component: FirstPay, name: 'FirstPay', meta: {keepAlive: true}},
......@@ -289,10 +289,10 @@ export default new Router({
{path: '/contract-repayment', component: ContractRepayment, name: 'ContractRepayment', meta: {keepAlive: true}},
{path: '/repay-details', component: RepayDetails, name: 'RepayDetails', meta: {keepAlive: true}},
{path: '/repay-plan', component: RepayPlan, name: 'RepayPlan', meta: {keepAlive: true}},
// 发车申请
// 融资合同创建
{path: '/start-List', component: StartList, name: 'StartList', meta: {keepAlive: false}},
{path: '/add-car', component: AddCar, name: 'AddCar', meta: {keepAlive: false}},
// 发车确认
{path: '/add-car', component: AddCar, name: 'AddCar', meta: {keepAlive: true}},
// 合同签订
{path: '/confirm-detail', component: ConfirmDetail, name: 'ConfirmDetail', meta: {keepAlive: true}},
{path: '/confirm-list', component: ConfirmList, name: 'ConfirmList', meta: {keepAlive: false}},
// 合同查询
......
src/scripts/hlsPopup.js
View file @ f3534b27
......@@ -153,7 +153,6 @@ export default {
* @param confirmObject.cancelText 确定函数
*/
showConfirm: function (confirmObject) {
debugger
let def = {
title: confirmObject.title || '提示',
content: confirmObject.content || '',
......
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