Skip to content

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

Merge branch 'ren' into develop

parents 1d6292a1 af9c20f3
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 90 deletions
src/pages/contractCreate/creat-rent-info.vue
View file @ 9a40d7cb
......@@ -344,6 +344,9 @@ export default {
},
save () {
let vm = this
vm.$router.push({
name: 'CreateEnclosureInfo',
})
let url = process.env.basePath + 'prj_lease_info_save'
vm.saveInfo.down_payment_ratio = (vm.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2)
vm.saveInfo.lease_charge_ratio = (vm.saveInfo.lease_charge_ratio_n.replace('%', '') / 100).toFixed(2)
......
src/pages/contractCreate/create-enclosure-info.vue
View file @ 9a40d7cb
......@@ -26,13 +26,7 @@
<div class="userInfo">基本资料</div>
<div v-if="bpClass === 'ORG'" class="house">
<p class="titles">营业执照</p>
<div v-if="!licenseImg" class="card-upload" @click="ocrShow('CAR_CARD', '')">
<img src="@/assets/userBind/camera.png" class="upload-btn" >
</div>
<div v-if="licenseImg && status !== 'APPROVED'" class="card-upload">
<img :src="licenseImg" @click="ocrShow('CAR_CARD', '')">
</div>
<div v-if="licenseImg && status === 'APPROVED'" class="card-upload">
<div v-if="licenseImg" class="card-upload">
<img :src="licenseImg" @click="showBigPicture(licenseImg)">
</div>
</div>
......@@ -40,11 +34,7 @@
<p v-if="bpClass === 'NP'" class="titles">身份证</p>
<p v-if="bpClass === 'ORG'" class="titles">法人代表身份证</p>
<div class="upload-box">
<div v-if="!idCardFront" @click="ocrShow('idCard', 'front')">
<img src="@/assets/userBind/front.png" >
<p>正面</p>
</div>
<div v-if="idCardFront && status === 'APPROVED'">
<div v-if="idCardFront">
<img
v-if="idCardFront"
:src="idCardFront"
......@@ -52,19 +42,7 @@
@click="showBigPicture(idCardFront)"
>
</div>
<div v-if="idCardFront && status !== 'APPROVED'">
<img
v-if="idCardFront"
:src="idCardFront"
style="width: 100%;height: 100%;margin: 0"
@click="ocrShow('idCard', 'front')"
>
</div>
<div v-if="!idCardBack" @click="ocrShow('idCard', 'back')">
<img src="@/assets/userBind/back.png" >
<p>反面</p>
</div>
<div v-if="idCardBack && status === 'APPROVED'">
<div v-if="idCardBack">
<img
v-if="idCardBack"
:src="idCardBack"
......@@ -72,49 +50,23 @@
@click="showBigPicture(idCardBack)"
>
</div>
<div v-if="idCardBack && status !== 'APPROVED'">
<img
v-if="idCardBack"
:src="idCardBack"
style="width: 100%;height: 100%;margin: 0"
@click="ocrShow('idCard', 'back')"
>
</div>
</div>
</div>
<div class="house">
<p class="titles">房产证件</p>
<div v-if="!houseImg" class="card-upload" @click="ocrShow('HOUSE_CARD', '')">
<img src="@/assets/userBind/camera.png" class="upload-btn" >
</div>
<div v-if="houseImg && status !== 'APPROVED'" class="card-upload">
<img :src="houseImg" @click="ocrShow('HOUSE_CARD', '')">
</div>
<div v-if="houseImg && status === 'APPROVED'" class="card-upload">
<div v-if="houseImg" class="card-upload">
<img :src="houseImg" @click="showBigPicture(houseImg)">
</div>
</div>
<div class="house">
<p class="titles">车辆行驶证</p>
<div v-if="!carImg" class="card-upload" @click="ocrShow('CAR_CARD', '')">
<img src="@/assets/userBind/camera.png" class="upload-btn" >
</div>
<div v-if="carImg && status !== 'APPROVED'" class="card-upload">
<img :src="carImg" @click="ocrShow('CAR_CARD', '')">
</div>
<div v-if="carImg && status === 'APPROVED'" class="card-upload">
<div v-if="carImg" class="card-upload">
<img :src="carImg" @click="showBigPicture(carImg)">
</div>
</div>
<div v-if="bpClass === 'NP'" class="house">
<p class="titles">婚姻状况证明</p>
<div v-if="!marryImg" class="card-upload" @click="ocrShow('CAR_CARD', '')">
<img src="@/assets/userBind/camera.png" class="upload-btn" >
</div>
<div v-if="marryImg && status !== 'APPROVED'" class="card-upload">
<img :src="marryImg" @click="ocrShow('', '')">
</div>
<div v-if="marryImg && status === 'APPROVED'" class="card-upload">
<div v-if="marryImg" class="card-upload">
<img :src="marryImg" @click="showBigPicture(marryImg)">
</div>
</div>
......@@ -134,7 +86,7 @@
</h-content>
<bottom-tab class="add-box">
<tab-button class="before" @click.native="$routeGo()">保存</tab-button>
<tab-button class="next" @click.native="goRent">提交</tab-button>
<tab-button class="next" @click.native="handleSubmit">提交</tab-button>
</bottom-tab>
</h-view>
</template>
......@@ -173,6 +125,7 @@ export default {
vm.bpClass = window.localStorage.bp_class
vm.status = window.localStorage.user_bp_status
vm.loadItemList()
// vm.getPrjId()
}
})
},
......@@ -329,6 +282,36 @@ export default {
}
})
},
// 获取项目id
getPrjId () {
let vm = this
let url = process.env.basePath + 'get_project_id'
let param = { }
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
console.log('获取项目id', res)
if (res.result === 'S') {
// vm.showLists = res.lists
}
})
},
// 项目提交审批
handleSubmit () {
let vm = this
let url = process.env.basePath + 'prj_project_submit'
let param = {
project_id: vm.project_id,
}
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
console.log('项目提交审批', res)
if (res.result === 'S') {
// vm.showLists = res.lists
}
})
},
},
}
</script>
......
src/pages/contractInquire/repay-plans.vue
View file @ 9a40d7cb
<!--
* @Author: your name
* @Date: 2019-10-31 09:49:57
* @LastEditTime : 2019-12-24 18:28:09
* @LastEditTime : 2019-12-24 18:34:37
* @LastEditors : Please set LastEditors
* @Description: 还款
* @FilePath:
......@@ -58,10 +58,8 @@
</div>
</div>
<div class="name">
<!-- <span>款项</span>
<span>租金</span> -->
<p>利息</p>
<p>{{ item.interest }}</p>
<span>利息</span>
<span>{{ item.interest | currency }}</span>
</div>
<img v-if="statu === 'black'" src="@/assets/contractInquire/done.png" alt="" class="status">
<img v-if="statu === 'orange'" src="@/assets/contractInquire/prompt.png" alt="" class="status">
......@@ -376,6 +374,7 @@ export default {
color: #4B4A4B;
//padding-top: 20px;
margin-left: 40px;
margin-top: -16px;
span:nth-of-type(2) {
margin-left: 8px;
}
......
src/pages/contractSigning/contract-repay-plan.vue
View file @ 9a40d7cb
<!--
* @Author: your name
* @Date: 2019-10-30 19:29:24
* @LastEditTime: 2019-11-15 09:14:47
* @LastEditors: Please set LastEditors
* @LastEditTime : 2019-12-24 18:38:21
* @LastEditors : Please set LastEditors
* @Description: In User Settings Edit
-->
<template>
......@@ -47,13 +47,19 @@
<p>{{ item.due_date.substr(0,4) }}</p>
<span>{{ dateConverse(item.due_date).substr(5,10) }}</span>
</div>
<div class="name">
<span>款项</span>
<span>租金</span>
</div>
<div class="number">
<span>应还金额</span>
<span :class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}">{{ item.rental * product_num |currency }}</span>
<div>
<span>本金</span>
<span>{{ item.principal |currency }}</span>
</div>
<div>
<span>租金</span>
<span :class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}">{{ item.rental |currency }}</span>
</div>
</div>
<div class="name">
<span>利息</span>
<span>{{ item.interest | currency }}</span>
</div>
<img v-if="statu === 'black'" src="@/assets/contractInquire/done.png" alt="" class="status">
<img v-if="statu === 'orange'" src="@/assets/contractInquire/prompt.png" alt="" class="status">
......@@ -384,7 +390,7 @@ export default {
font-family: PingFangSC-Regular;
font-size: 13px;
color: #4B4A4B;
padding-top: 20px;
//padding-top: 20px;
margin-left: 22px;
span:nth-of-type(2) {
margin-left: 8px;
......@@ -396,11 +402,15 @@ export default {
.number {
// flex: 9;
display: flex;
flex-direction: column;
justify-content: space-evenly;
font-family: PingFangSC-Regular;
font-size: 13px;
color: #4B4A4B;
padding-top: 20px;
//padding-top: 20px;
margin-left: 40px;
margin-top: -16px;
span:nth-of-type(2) {
margin-left: 8px;
}
......
src/pages/distributorSign/financ-details.vue
View file @ 9a40d7cb
<!--
* @Author: your name
* @Date: 2019-10-30 19:29:24
* @LastEditTime: 2019-11-13 16:36:01
* @LastEditors: Please set LastEditors
* @LastEditTime : 2019-12-24 18:39:52
* @LastEditors : Please set LastEditors
* @Description: In User Settings Edit
-->
<template>
......@@ -45,13 +45,19 @@
<p>{{ item.due_date.substr(0,4) }}</p>
<span>{{ dateConverse(item.due_date).substr(5,10) }}</span>
</div>
<div class="name">
<span>款项</span>
<span>租金</span>
</div>
<div class="number">
<span>应还金额</span>
<span :class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}">{{ item.rental*product_num |currency }}</span>
<div>
<span>本金</span>
<span>{{ item.principal |currency }}</span>
</div>
<div>
<span>租金</span>
<span :class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}">{{ item.rental |currency }}</span>
</div>
</div>
<div class="name">
<span>利息</span>
<span>{{ item.interest | currency }}</span>
</div>
<img v-if="statu === 'black'" src="@/assets/contractInquire/done.png" alt="" class="status">
<img v-if="statu === 'orange'" src="@/assets/contractInquire/prompt.png" alt="" class="status">
......@@ -348,7 +354,7 @@ export default {
font-family: PingFangSC-Regular;
font-size: 13px;
color: #4B4A4B;
padding-top: 20px;
//padding-top: 20px;
margin-left: 22px;
span:nth-of-type(2) {
margin-left: 8px;
......@@ -360,11 +366,15 @@ export default {
.number {
// flex: 9;
display: flex;
flex-direction: column;
justify-content: space-evenly;
font-family: PingFangSC-Regular;
font-size: 13px;
color: #4B4A4B;
padding-top: 20px;
//padding-top: 20px;
margin-left: 40px;
margin-top: -16px;
span:nth-of-type(2) {
margin-left: 8px;
}
......
src/pages/financingTrial/trial-repay-plan.vue
View file @ 9a40d7cb
<!--
* @Author: your name
* @Date: 2019-10-30 19:29:24
* @LastEditTime: 2019-11-13 10:34:23
* @LastEditors: Please set LastEditors
* @LastEditTime : 2019-12-24 18:41:37
* @LastEditors : Please set LastEditors
* @Description: In User Settings Edit
-->
<template>
......@@ -45,13 +45,19 @@
<p>{{ item.due_date.substr(0,4) }}</p>
<span>{{ dateConverse(item.due_date).substr(5,10) }}</span>
</div>
<div class="name">
<span>款项</span>
<span>租金</span>
</div>
<div class="number">
<span>应还金额</span>
<span :class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}">{{ item.rental |currency }}</span>
<div>
<span>本金</span>
<span>{{ item.principal |currency }}</span>
</div>
<div>
<span>租金</span>
<span :class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}">{{ item.rental |currency }}</span>
</div>
</div>
<div class="name">
<span>利息</span>
<span>{{ item.interest | currency }}</span>
</div>
<img v-if="statu === 'black'" src="@/assets/contractInquire/done.png" alt="" class="status">
<img v-if="statu === 'orange'" src="@/assets/contractInquire/prompt.png" alt="" class="status">
......@@ -366,7 +372,7 @@ export default {
font-family: PingFangSC-Regular;
font-size: 13px;
color: #4B4A4B;
padding-top: 20px;
//padding-top: 20px;
margin-left: 22px;
span:nth-of-type(2) {
margin-left: 8px;
......@@ -378,11 +384,15 @@ export default {
.number {
// flex: 9;
display: flex;
flex-direction: column;
justify-content: space-evenly;
font-family: PingFangSC-Regular;
font-size: 13px;
color: #4B4A4B;
padding-top: 20px;
//padding-top: 20px;
margin-left: 40px;
margin-top: -16px;
span:nth-of-type(2) {
margin-left: 8px;
}
......
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