Commit c124e815 authored by JingChao's avatar JingChao

Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

parents 105bb3a2 fc8b3605
......@@ -11,7 +11,7 @@
<div class="down-content">
<span>请上传照片</span>
<div class="photo">
<!-- <img src=""> -->
<img :src="vehicleImg">
</div>
<list-item :item-height="44">
<item>
......@@ -107,7 +107,7 @@
v-for="(item,index) in equip"
:key="index"
class="equipment"
@click="downNum=true;getRent(item.contract_id)"
@click="downNum=true;getRent(item.contract_id,item.contract_lease_item_id)"
>
<div class="left">
<span>
......@@ -194,6 +194,7 @@ export default {
downNum: false,
show: false,
flag: false, // 判断是否为已确认
vehicleImg: '', // 查询到的合格证
leasePic: '', // 租赁合同图片
agentPic: '', // 经销商担保协议图片
bankPic: '', // 农行代扣授权书图片
......@@ -257,6 +258,30 @@ export default {
})
},
methods: {
getImg (id) { // 获取合格证
let vm = this
let randomString = Math.floor(Math.random() * 21)
let url =
process.env.basePath +
'app_attment_query' +
'&index' +
`'${randomString}'`
let param = {
'master': {
'source_type': 'CON_CONTRACT_LEASE_ITEM',
'pkvalue': id,
},
}
vm.$post(url, param).then(function (res) {
if (res.result === 'S') {
if (res.info) {
vm.vehicleImg = process.env.filePath + 'attachment_id=' + res.info.attachment_id + '&access_token=' + window.localStorage.access_token
}
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
// 签约校验
async signCheck () {
let vm = this
......@@ -284,7 +309,7 @@ export default {
content: '请自拍一张',
onConfirm: function (index) {
if (index === 1) {
vm.takePhontoOpenCamera()
vm.takePhontoOpenCamera()
} else {
}
......@@ -329,7 +354,7 @@ export default {
// 获取身份证照片
async idCardImgUrlGet () {
let vm = this
let url = $config.basePath + 'prj_id_card_query'
let url = $config.basePath + 'car_id_card_query'
let param = {
confirm_id: vm.confirm_id,
}
......@@ -376,13 +401,13 @@ export default {
},
goBodyCheck (confirm_id) { // 活体检测
this.$refs.body.show()
/*this.$router.push({
/* this.$router.push({
name: 'BodyCheck',
params: {
check_id: this.$route.params.check_id,
confirm_id: confirm_id,
},
})*/
}) */
},
// 图片保存
save_picture (list) {
......@@ -500,7 +525,7 @@ export default {
}
})
},
getRent (e) {
getRent (e, id) {
let vm = this
let url = process.env.basePath + 'leases_info_query'
let param = {
......@@ -511,6 +536,7 @@ export default {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
Object.assign(vm.rentInfo, res.info)
vm.getImg(id)
} else {
hlsPopup.showLongCenter(res.message)
}
......
......@@ -130,7 +130,8 @@ export default {
contractList () {
let vm = this
if (vm.num === 1) {
let url = $config.basePath + 'prj_submit_list'
let randomString = Math.floor(Math.random() * 21)
let url = $config.basePath + 'prj_submit_list' + '&index' + `'${randomString}'`
let param = {
user_phone: window.localStorage.user_phone,
pagesize: 10,
......@@ -154,7 +155,8 @@ export default {
}
})
} else if (vm.num === 2) {
let url = $config.basePath + 'prj_submit_list'
let randomString = Math.floor(Math.random() * 21)
let url = $config.basePath + 'prj_submit_list' + '&index' + `'${randomString}'`
let param = {
pagesize: 10,
pagenum: vm.approvedPagenum,
......@@ -185,7 +187,8 @@ export default {
let vm = this
if (vm.num === 1) {
vm.submitPagenum++
let url = $config.basePath + 'prj_submit_list'
let randomString = Math.floor(Math.random() * 21)
let url = $config.basePath + 'prj_submit_list' + '&index' + `'${randomString}'`
let param = {
user_phone: window.localStorage.user_phone,
pagesize: 10,
......@@ -219,7 +222,8 @@ export default {
})
} else if (vm.num === 2) {
vm.approvedPagenum++
let url = $config.basePath + 'prj_submit_list'
let randomString = Math.floor(Math.random() * 21)
let url = $config.basePath + 'prj_submit_list' + '&index' + `'${randomString}'`
let param = {
user_phone: window.localStorage.user_phone,
pagesize: 10,
......@@ -256,7 +260,8 @@ export default {
async submitSearch () {
let vm = this
vm.submitPagenum = 1
let url = $config.basePath + 'prj_submit_list'
let randomString = Math.floor(Math.random() * 21)
let url = $config.basePath + 'prj_submit_list' + '&index' + `'${randomString}'`
let param = {
user_phone: window.localStorage.user_phone,
pagesize: 10,
......@@ -286,7 +291,8 @@ export default {
},
approvedearch () {
let vm = this
let url = $config.basePath + 'prj_submit_list'
let randomString = Math.floor(Math.random() * 21)
let url = $config.basePath + 'prj_submit_list' + '&index' + `'${randomString}'`
vm.approvedPagenum = 1
let param = {
user_phone: window.localStorage.user_phone,
......
......@@ -186,6 +186,12 @@ export default {
},
immediate: true,
},
// '$route' (to, from) {
// debugger
// if (from.fullPath !== '/contract-create-list' && to.fullPath === '/sales-info') {
// this.$router.go(0)
// }
// },
},
activated () {
......@@ -222,7 +228,8 @@ export default {
}
vm.businessQuery().then(res => {
vm.agentQuery().then(res => {
vm.factoryQuery()
vm.factoryQuery().then(res => {
})
})
})
} else if (from.name === 'CreateBaseInfo') {
......@@ -327,7 +334,7 @@ export default {
phone: window.localStorage.getItem('user_phone'),
}
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
return vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
vm.factoty = res.lists
if (res.result === 'S') {
......
......@@ -10,7 +10,7 @@
<div class="down-content">
<span>请上传照片</span>
<div class="photo" @click="ocrShow()">
<img v-if="vehicleImg" :src="vertifyImg" alt="">
<img v-if="vehicleImg" :src="vehicleImg" alt="">
</div>
<list-item :item-height="44">
<item>
......@@ -156,7 +156,7 @@
v-for="(item,index) in equip"
:key="index"
class="equipment"
@click="downNum = true;getRent(item.contract_id)"
@click="downNum = true;getRent(item.contract_id,item.contract_lease_item_id)"
>
<div class="left">
<span>
......@@ -244,6 +244,9 @@ export default {
read: false, // 表示只读
showDate: '',
flag: false,
isUpload: false, // 是否上传
contract_lease_item_id: '',
upload_list: [], // 上传列表
productLine: [
{
code: '5',
......@@ -374,6 +377,30 @@ export default {
})
},
methods: {
getImg (id) { // 获取合格证
let vm = this
let randomString = Math.floor(Math.random() * 21)
let url =
process.env.basePath +
'app_attment_query' +
'&index' +
`'${randomString}'`
let param = {
'master': {
'source_type': 'CON_CONTRACT_LEASE_ITEM',
'pkvalue': id,
},
}
vm.$post(url, param).then(function (res) {
if (res.result === 'S') {
if (res.info) {
vm.vehicleImg = process.env.filePath + 'attachment_id=' + res.info.attachment_id + '&access_token=' + window.localStorage.access_token
}
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
// ocr识别入口
ocrShow () {
let vm = this
......@@ -400,6 +427,7 @@ export default {
if (!imgdata) {
hlsPopup.showLongCenter('请拍照')
} else {
vm.isUpload = true
vm.vehicleImg = imgdata
vm.vehicleIdentify(imgdata)
}
......@@ -421,6 +449,7 @@ export default {
if (imgUrl.length === 0) {
hlsPopup.showLongCenter('请选择一张图片')
} else {
vm.isUpload = true
vm.vehicleImg = imgUrl[0]
vm.vehicleIdentify(imgUrl[0])
}
......@@ -441,10 +470,48 @@ export default {
let result = res.result.words_result
vm.info.frame_number = result.VinNo // 车架号
vm.info.engine = result.EngineNo // 发动机号
// vm.vehicle_model = result.VinNo // 车辆型号
vm.vehicle_model = result.VinNo // 车辆型号
vm.info.certificate_number = result.CertificationNo // 合格证编号
})
},
// 图片保存
save_picture (list) {
let vm = this
if (list.length) {
// hlsPopup.showLoading('图片上传请稍候')
var alreadyUploadNum = 0
var attLength = 0
var recordUploadInterval = setInterval(function () {
if (alreadyUploadNum === attLength) {
clearInterval(recordUploadInterval)
/* hlsPopup.hideLoading()
hlsPopup.showLongCenter('图片上传成功') */
}
}, 500)
for (var i = 0; i < list.length; i++) {
let uploadSuccess = function (res) {
if (res.result === 'S') {
alreadyUploadNum++
for (var j = 0; j < list.length; j++) {
if (list[j].filePath === res.response.filePath) {
list[j].attachment_id = res.response.attachment_id
vm.upload_list.push(list[j])
break
}
}
} else {
hlsPopup.hideLoading()
}
}
if (!list[i].attachment_id) {
attLength++
hlsUtil.fileUploadSvc(list[i], uploadSuccess)
}
}
} else {
hlsPopup.hideLoading()
}
},
showTime (format) {
this.hlsPopup.showTime({
nowDate: `${this.carDate}`,
......@@ -474,6 +541,7 @@ export default {
vm.hlsPopup.hideLoading()
if (res.code === '00') {
vm.hlsPopup.showSuccess('保存成功')
vm.savePicture()
setTimeout(() => {
vm.downNum = false
vm.getEquipment()
......@@ -483,6 +551,22 @@ export default {
}
})
},
savePicture () {
let vm = this
let list = []
let obj = {
pkvalue: vm.contract_lease_item_id,
source_type: 'CON_CONTRACT_LEASE_ITEM',
picture: '',
check_id: vm.contract_lease_item_id,
filePath: vm.vehicleImg,
attachment_id: '',
user_id: 1,
fileName: '合格证',
}
list.push(obj)
vm.save_picture(list)
},
isSave () {
this.hlsPopup.showConfirm({
title: '提示',
......@@ -515,7 +599,7 @@ export default {
},
})
},
getRent (e) {
getRent (e, id) {
let vm = this
for (let i in vm.info) {
vm.info[i] = ''
......@@ -530,6 +614,8 @@ export default {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
Object.assign(vm.info, res.info)
vm.getImg(id)
vm.contract_lease_item_id = id
} else {
hlsPopup.showLongCenter(res.message)
}
......
......@@ -12,7 +12,7 @@
<div slot="center">个人中心</div>
</h-header>
<div class="top" style="margin-top:-1px;">
<div :class="['top',(multipleRole!=='GUTA'&&user_bp_type!=='GUTA')?'has':'antiHas']" style="margin-top:-1px;">
<div class="card-top">
<img :src="upLoadObj" @click="checkType" >
<div class="sign">
......@@ -26,18 +26,18 @@
</div>
</div>
</div>
<div class="card">
<div v-if="multipleRole!=='GUTA'&&user_bp_type!=='GUTA'" class="card">
<div class="card-info">
<div class="card-bottom">
<div v-if="(user_bp_type!=='TENANT')&&(user_bp_type!=='GUTA')" @click="goStart">
<img src="@/assets/myInfo/car.png" >
<p>发车申请</p>
</div>
<div v-if="(user_bp_type==='TENANT')||(user_bp_type==='GUTA')" @click="changePay">
<div v-if="(user_bp_type==='TENANT')" @click="changePay">
<img src="@/assets/myInfo/pay.png" >
<p>首付还款</p>
</div>
<div v-if="(user_bp_type==='TENANT')||(user_bp_type==='GUTA')" @click="changeRent">
<div v-if="(user_bp_type==='TENANT')" @click="changeRent">
<img src="@/assets/myInfo/refund.png" >
<p>租金还款</p>
</div>
......@@ -147,14 +147,14 @@
</h-content>
<role-switch
v-show="roleSwitchFlag"
ref="roleSwitch"
ref="roleSwitchRoleList"
:roleList="roleList"
@roleConfirm="roleConfirm"
@roleCancle="roleCancle"
/>
<role-switch
v-show="popSetectBox"
ref="roleSwitch"
ref="roleSwitchType"
:roleList="type"
@roleConfirm="typeConfirm"
@roleCancle="typeCancle"
......@@ -171,6 +171,7 @@ export default {
data () {
return {
currentVersion: process.env.currentVersion,
multipleRole: '',
upLoadObj: defaultImg, // 上传的图片
flag: true,
isAGENT: false,
......@@ -277,6 +278,7 @@ export default {
created () {},
beforeRouteEnter (to, from, next) {
next(vm => {
vm.multipleRole = window.localStorage.getItem('multipleRole')
vm.userQuery()
vm.numQuery()
})
......@@ -323,6 +325,13 @@ export default {
// 选择角色后确定
roleConfirm (role) {
this.roleSwitchFlag = false
if (role.bp_type === 'TENANT') {
window.localStorage.setItem('multipleRole', 'TENANT')
this.multipleRole = 'TENANT'
} else if (role.bp_type === 'GUTA') {
window.localStorage.setItem('multipleRole', 'GUTA')
this.multipleRole = 'GUTA'
}
console.log('选择后的角色为:' + role)
},
typeConfirm (e) { // 选择操作方式后
......@@ -624,7 +633,11 @@ export default {
} else if (index === 1) {
this.changePageHead()
} else if (index === 2) {
this.$refs.roleSwitch.show()
if (((vm.user_bp_type === 'TENANT') || (vm.user_bp_type === 'GUTA')) && (vm.user_bp_status === 'APPROVED')) {
this.$refs.roleSwitchRoleList.show()
} else {
hlsPopup.showLongCenter('您当前尚无可用角色')
}
}
},
})
......@@ -916,11 +929,15 @@ export default {
hlsPopup.showLoading('请稍候')
let res = await vm.$post(url, param)
hlsPopup.hideLoading()
if (res.info.code === 0) {
return res.info.data.authUrl
if ((res.info.code === 0) && (res.info.data.authUrl)) {
vm.authUrl = res.info.data.authUrl
return vm.authUrl
} else if ((res.info.code === 0) && (res.info.data.openId)) {
vm.authUrl = res.info.data.openId
return vm.authUrl
} else {
hlsPopup.showLongCenter(res.info.msg)
return null
hlsPopup.showError(res.info.msg)
return ''
}
},
// 获取企业认证url
......@@ -933,11 +950,21 @@ export default {
hlsPopup.showLoading('请稍候')
let res = await vm.$post(url, param)
hlsPopup.hideLoading()
if (res.info.code === 0) {
return res.info.data.authUrl
// if (res.info.code === 0) {
// return res.info.data.authUrl
// } else {
// hlsPopup.showLongCenter(res.info.msg)
// return null
// }
if ((res.info.code === 0) && (res.info.data.authUrl)) {
vm.authUrl = res.info.data.authUrl
return vm.authUrl
} else if ((res.info.code === 0) && (res.info.data.openId)) {
vm.authUrl = res.info.data.openId
return vm.authUrl
} else {
hlsPopup.showLongCenter(res.info.msg)
return null
hlsPopup.showError(res.info.msg)
return ''
}
},
},
......@@ -1004,9 +1031,15 @@ export default {
border: 1px solid #00469c;
}
}
.has{
height:206px;
}
.antiHas{
height:3.12rem;
}
.top {
width: 100%;
height: 206px;
// height: 206px;
background: url("../../assets/myInfo/back.png") no-repeat;
background-size: 100% 156px;
background-color: #efefef;
......
......@@ -7,7 +7,7 @@
<div v-show="showFlag" class="role-switch-wrap">
<div class="role-switch-content">
<div class="content-header">
<span>请选择要切换的角色</span>
<span>请选择要切换的内容</span>
<img src="@/assets/myInfo/modalClose.png" @click="roleCancle">
</div>
<div class="content-wrap">
......
......@@ -62,7 +62,7 @@
</div>
</div>
<div v-if="isShowpayInfo" class="box-wrap">
<!-- <div class="box-top">
<!-- <div class="box-top">
<img src="@/assets/payment/bank-title.png" >
</div>-->
<div class="box-center">
......@@ -71,7 +71,7 @@
<div slot="name" class="name">订单编号</div>
<div slot="content">{{ info.order_number }}</div>
</item>
<!-- <item>
<!-- <item>
<div slot="name" class="name">付款人</div>
<div slot="content">{{ info.pay_amount_name }}</div>
</item>
......@@ -79,13 +79,13 @@
<div slot="name" class="name">付款账号</div>
<div slot="content">{{ info.pay_amount }}</div>
</item>-->
<!-- <item>
<!-- <item>
<div slot="name" class="name">交易金额</div>
<div slot="content">{{ info.orderamount|currency }}</div>
</item>-->
<div class="orderamount-wrap">
<span class="orderamount-item">交易金额</span>
<span class="orderamount-item font-color">{{info.orderamount|currency}}</span>
<span class="orderamount-item font-color">{{ info.orderamount|currency }}</span>
</div>
<item>
<div slot="name" class="name">支付方式</div>
......@@ -105,13 +105,13 @@
<p>手机K码支付需要您开通我行消息服务。</p>
<p>掌上银行支付需要您首先开通我行掌上银行,</p>
<p>且支付账户已添加到掌上银行;</p>
<!-- <p>www.abchina. com</p>
<!-- <p>www.abchina. com</p>
<p>全国24小时服务热线:95599</p>
<p>中国农业银行版权所有</p>-->
</div>
</div>
</h-content>
<!-- <bottom-tab>
<!-- <bottom-tab>
<tab-button v-if="showpay" class="foot" @click.native="pay">立即支付</tab-button>
<tab-button v-if="nextPay" class="foot" @click.native="pay">继续支付</tab-button>
<tab-button v-if="showSelect" class="foot" @click.native="searchResult">查询支付结果</tab-button>
......@@ -176,7 +176,7 @@ export default {
pay (status) {
let vm = this
vm.nextPay = false
if(status === 'continue' && vm.payType === 'ABC_UNION'){ // 在银联模式下继续支付重新获取支付url,因为银联页面只能打开一次
if (status === 'continue' && vm.payType === 'ABC_UNION') { // 在银联模式下继续支付重新获取支付url,因为银联页面只能打开一次
hlsPopup.showConfirm({
title: '提示',
content: '银联不支持二次支付,请重新发起支付订单',
......@@ -188,16 +188,16 @@ export default {
}
},
})
}else{
cordova.InAppBrowser.open(this.url, '_blank', 'location=yes')
// window.open(this.url)
} else {
cordova.InAppBrowser.open(this.url, '_blank', 'location=yes')
// window.open(this.url)
}
setTimeout(() => {
vm.showSelect = true
vm.showpay = false
}, 3000)
},
getPayUrl(){
getPayUrl () {
let vm = this
let url = process.env.basePath + 'merchant_payment'
let param = {
......@@ -209,7 +209,7 @@ export default {
if (res.return_code !== '0000') {
hlsPopup.showLongCenter(res.error_message)
} else {
cordova.InAppBrowser.open(res.paymentURL, '_blank', 'location=yes')
cordova.InAppBrowser.open(res.paymentURL, '_blank', 'location=yes')
}
} else {
hlsPopup.showLongCenter(res.message)
......
......@@ -151,7 +151,7 @@ export default {
beforeRouteEnter (to, from, next) {
next(vm => {
vm.getBankInfo()
// vm.getNpCertificationUrl()
// vm.getNpCertificationUrl()
})
},
methods: {
......@@ -222,7 +222,7 @@ export default {
vm.$router.push({
name: 'HomePage',
})
} else {
} else if (vm.certification_status === 'N') {
vm.$router.push({
name: 'Certification',
params: {
......@@ -254,7 +254,7 @@ export default {
if ((res.info.code === 0) && (res.info.data.authUrl)) {
vm.authUrl = res.info.data.authUrl
return vm.authUrl
} else if((res.info.code === 0) && (res.info.data.openId)){
} else if ((res.info.code === 0) && (res.info.data.openId)) {
vm.authUrl = res.info.data.openId
return vm.authUrl
} else {
......
......@@ -20,7 +20,7 @@
@click="selectIdTypeOnly()"
>
</item>
<item v-if="isApproved&&isMultiRole" :showArrow="true" @click.native="selectIdType()">
<item v-if="isApproved&&isMultiRole&&!hasMultiRole" :showArrow="true" @click.native="selectIdType()">
<div slot="name" class="required">客户类型</div>
<div slot="content" class="typeBP">
<span>{{ baseInfo.bp_type_n }}</span>
......@@ -30,6 +30,13 @@
</span>
</div>
</item>
<item v-if="isApproved&&isMultiRole&&hasMultiRole" :showArrow="true">
<div slot="name" class="required">客户类型</div>
<div slot="content" class="typeBP">
<span>{{ baseInfo.bp_type_n }}</span>
<span v-if="multiRole.bp_type_n">{{ multiRole.bp_type_n }}</span>
</div>
</item>
<item v-if="(isPaople&&from)||(isPaople&&isSelected)">
<div slot="name" class="required">业务经办人</div>
<input slot="content" v-model="baseInfo.agent_username" placeholder="请输入业务经办员工代码" >
......@@ -319,8 +326,9 @@ export default {
isApproved: false,
isSave: false,
isAGENT: this.$route.params.isAGENT,
isMultiRole: this.$route.params.isMultiRole,
isMultiRole: this.$route.params.isMultiRole, // 能否选择多角色
isSelected: false,
hasMultiRole: false, // 是否有第二个角色
from: false,
multiBpType: {
bp_type_n: '',
......@@ -336,6 +344,10 @@ export default {
maritalList: [],
districtList: [],
img_url: {},
multiRole: {
bp_type_n: '',
bp_type: '',
}, // 查询出来的第二个角色
baseInfo: {
bp_type_n: '',
academic_background_n: '',
......@@ -468,6 +480,7 @@ export default {
vm.from = true
vm.basicInfoQuery()
vm.loadItemList() // 附件查询
vm.checkHasmultiple()// 查询是否有新角色
} else if (from.name === 'UserBind') {
vm.list = {}
vm.multiBpType = {
......@@ -762,6 +775,31 @@ export default {
}
})
},
checkHasmultiple () {
let vm = this
let url = process.env.basePath + 'bp_role_check'
let param = {
bp_id: window.localStorage.getItem('bp_id'),
}
// vm.hlsPopup.showLoading('请稍后')
vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.hasMultiRole = true
if (vm.baseInfo.bp_type === 'TENANT') {
vm.multiRole.bp_type_n = '担保人'
vm.multiRole.bp_type = 'GUTA'
} else if (vm.baseInfo.bp_type === 'GUTA') {
vm.multiRole.bp_type_n = '承租人'
vm.multiRole.bp_type = 'TENANT'
}
} else {
vm.hasMultiRole = false
vm.multiRole.bp_type = ''
vm.multiRole.bp_type_n = ''
}
})
},
// 基本信息保存前校验
bindCheck () {
let vm = this
......@@ -808,8 +846,8 @@ export default {
window.localStorage.setItem('bp_name', vm.baseInfo.bp_name)
window.localStorage.setItem('bp_type', vm.baseInfo.bp_type)
window.localStorage.setItem('from', vm.from)
// vm.bindCheck()
vm.$router.push({
// vm.bindCheck()
vm.$router.push({
name: 'NPInvoiceInfo',
})
return res.bp_id
......
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