Skip to content

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

Merge branch 'ren' into develop

parents 0ebd9ebf 35547252
Hide whitespace changes
Inline Side-by-side
Showing with 266 additions and 116 deletions
src/pages/contractInquire/contract-records.vue
View file @ edef3e41
<!--
* @Author: your name
* @Date: 2019-10-31 09:49:57
* @LastEditTime: 2019-10-31 16:58:23
* @LastEditors: Please set LastEditors
* @Description: 合同查询--记录
* @FilePath:
-->
<template>
<h-view id="contract-records" class="public-style">
<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 v-if="data!==null">
<div class="tab">
<p><span :class="{'selected':selected === 'all'}" @click="isSelected('all')">全部</span></p>
<p><span :class="{'selected':selected === 'one'}" @click="isSelected('one')">待签约</span></p>
<p><span :class="{'selected':selected === 'two'}" @click="isSelected('two')">待还款</span></p>
<p><span :class="{'selected':selected === 'three'}" @click="isSelected('three')">还款中</span></p>
<p><span :class="{'selected':selected === 'four'}" @click="isSelected('four')">已结清</span></p>
</div>
<div v-if="data!==null" class="tab">
<p><span :class="{'selected':selected === 'all'}" @click="isSelected('all')">全部</span></p>
<p><span :class="{'selected':selected === 'one'}" @click="isSelected('one')">待签约</span></p>
<p><span :class="{'selected':selected === 'two'}" @click="isSelected('two')">待还款</span></p>
<p><span :class="{'selected':selected === 'three'}" @click="isSelected('three')">还款中</span></p>
<p><span :class="{'selected':selected === 'four'}" @click="isSelected('four')">已结清</span></p>
</div>
<div class="search">
<img src="@/assets/contractInquire/search.png" alt="">
<input type="text" placeholder="请输入合同号/承租人名称">
<div class="search">
<img src="@/assets/contractInquire/search.png" alt="">
<input type="text" placeholder="请输入合同号/承租人名称">
</div>
</div>
<h-content v-if="data!==null" class="pay-content">
<div v-for="(item,index) in 6" :key="index" class="contract-item">
<div class="header">
<img src="@/assets/contractRepayment/contract.png" alt="">
<h2>CON201903022001</h2>
<!-- 状态用类名控制 待还款orange,待签约blue,还款中green,已结清black -->
<p class="green">待还款</p>
<scroll ref="scrollList">
<div v-for="(item,index) in lists" :key="index" class="contract-item">
<div class="header">
<img src="@/assets/contractRepayment/contract.png" alt="">
<h2>{{ item.project_number }}</h2>
<!-- 状态用类名控制 待还款orange,待签约blue,还款中green,已结清black -->
<p class="green">待还款</p>
</div>
<div class="center">
<div><span>承租人</span><p>{{ item.bp_name }}</p></div>
<div><span>年利率</span><p>{{ item.int_rate_n }}</p></div>
<div><span>期限</span><p>{{ item.lease_times }}期</p></div>
<div><span>融资金额</span><p class="bold">{{ item.finance_amount | currency }}</p></div>
<span class="red">逾期一周</span>
<section @click="toRepayDetail(item.project_id)">
<img src="@/assets/contractRepayment/view.png" alt="">
<span>查看合同明细</span>
</section>
</div>
</div>
<div class="center">
<div><span>承租人</span><p>张三</p></div>
<div><span>年利率</span><p>5%</p></div>
<div><span>期限</span><p>12期</p></div>
<div><span>融资金额</span><p class="bold">90,000.00</p></div>
<span class="red">逾期一周</span>
<section @click="toRepayDetail">
<img src="@/assets/contractRepayment/view.png" alt="">
<span>查看合同明细</span>
</section>
</div>
</div>
</scroll>
</h-content>
<h-content v-if="data===null" class="null">
<div class="display">
......@@ -59,22 +71,56 @@ export default {
},
data () {
return {
// data: null, 无记录时
// data: null, // 无记录时
data: 1,
lists: [],
selected: 'all',
}
},
computed: {},
watch: {},
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'HomePage') {
vm.recordQuery()
}
})
},
methods: {
toRepayDetail () {
// 合同明细 val: project_id
toRepayDetail (val) {
this.$router.push({
name: 'RepayDetail',
params: {
project_id: val,
},
})
},
isSelected (name) {
this.selected = name
},
// 合同记录
recordQuery () {
let vm = this
let url = $config.basePath + 'con_contract_list'
let param = {
user_phone: window.localStorage.user_phone,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
if (res.lists.length === 0) {
vm.data = null
} else {
vm.data = 1
}
vm.lists = res.lists
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
},
}
</script>
......@@ -137,7 +183,7 @@ export default {
padding-left: 12px;
border-radius: 4px;
height: 36px;
width: 351px;
width: 100%;
font-family: PingFangSC-Regular;
font-size: 14px;
color: #888C8F;
......@@ -157,12 +203,12 @@ export default {
}
.pay-content {
padding: 0 8px;
padding: 8px 8px;
.contract-item {
height: 208px;
background-color: #fff;
margin-top: 8px;
margin-bottom: 8px;
.header {
position: relative;
......
src/pages/contractInquire/repay-detail.vue
View file @ edef3e41
<!--
* @Author: your name
* @Date: 2019-10-31 09:49:57
* @LastEditTime: 2019-10-31 16:17:39
* @LastEditors: Please set LastEditors
* @Description: 合同查询--明细
* @FilePath:
-->
<template>
<h-view id="repay-detail" class="public-style">
<h-header :proportion="[5,1,1]" class="bar-custom">
......@@ -15,23 +23,23 @@
<list-item :item-height="44" class="invoice">
<item>
<div slot="name">合同号</div>
<div slot="content">CON2019080310020</div>
<div slot="content">{{ detailInfo.project_number }}</div>
</item>
<item>
<div slot="name">经销商</div>
<div slot="content">****代理商</div>
<div slot="content">{{ detailInfo.bp_agent_name }}</div>
</item>
<item>
<div slot="name">承租人</div>
<div slot="content">张三</div>
<div slot="content">{{ detailInfo.bp_name }}</div>
</item>
<item>
<div slot="name">产品线</div>
<div slot="content">起重机</div>
<div slot="content">{{ detailInfo.division_n }}</div>
</item>
<item>
<div slot="name">合同金额</div>
<div slot="content">90,000.00</div>
<div slot="content">{{ detailInfo.total_price | currency }}</div>
</item>
<item>
<div slot="name">商务政策</div>
......@@ -39,7 +47,7 @@
</item>
<item>
<div slot="name">租赁物数量</div>
<div slot="content">3</div>
<div slot="content">{{ detailInfo.product_num }}</div>
</item>
</list-item>
......@@ -90,6 +98,14 @@ export default {
},
computed: {},
watch: {},
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'ContractRecords') {
vm.detailQuery()
vm.equipQuery()
}
})
},
methods: {
toRepayPlans () {
......@@ -97,6 +113,38 @@ export default {
name: 'RepayPlans',
})
},
detailQuery () {
let vm = this
let url = $config.basePath + 'con_contract_detial'
let param = {
project_id: vm.$route.params.project_id,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.detailInfo = res.info
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
equipQuery () {
let vm = this
let url = $config.basePath + 'con_equip_list'
let param = {
project_id: vm.$route.params.project_id,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
// if (res.result === 'S') {
// vm.detailInfo = res.info
// } else {
// hlsPopup.showLongCenter(res.message)
// }
})
},
},
}
</script>
......@@ -140,7 +188,7 @@ export default {
border-radius: 5px;
height: 24px;
line-height: 24px;
width: 93px;
// width: 93px;
font-family: PingFangSC-Regular;
font-size: 11px;
color: #1D3FFF;
......
src/pages/contractInquire/repay-plans.vue
View file @ edef3e41
<!--
* @Author: your name
* @Date: 2019-10-31 09:49:57
* @LastEditTime: 2019-10-31 14:47:21
* @LastEditors: Please set LastEditors
* @Description: 还款
* @FilePath:
-->
<template>
<h-view id="repay-plan" class="public-style">
<h-header :proportion="[5,1,1]" class="bar-custom">
......@@ -72,6 +80,13 @@ export default {
},
computed: {},
watch: {},
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'RepayDetail') {
vm.repayPlan()
}
})
},
methods: {
showDetails () {
if (!this.flag) {
......@@ -96,6 +111,23 @@ export default {
document.getElementById('content').style.transform = 'translate(0px, -' + 0 + 'px) scale(1) translateZ(0px)'
}
},
repayPlan () {
// let vm = this
// let url = $config.basePath + ''
// let param = {
// contract_id: vm.$route.params.contract_id,
// }
// vm.hlsPopup.showLoading('数据加载中')
// vm.hlsHttp.post(url, param).then(function (res) {
// console.log(res)
// vm.hlsPopup.hideLoading()
// if (res.result === 'S') {
// vm.detailInfo = res.info
// } else {
// hlsPopup.showLongCenter(res.message)
// }
// })
},
},
}
</script>
......
src/pages/financingTrial/financing-trial.vue
View file @ edef3e41
......@@ -2,7 +2,7 @@
* @Descrip 融资试算
* @Author: your name
* @Date: 2019-09-29 17:09:49
* @LastEditTime: 2019-10-31 09:25:17
* @LastEditTime: 2019-10-31 16:57:36
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -15,48 +15,47 @@
</h-header>
<!-- 搜索 -->
<div class="hinput">
<div class="search-box">
<input type="text" placeholder="请输入产品名称">
<img src="@/assets/distributorSign/search.png" alt="">
</div>
<div class="search">
<img src="@/assets/contractInquire/search.png" alt="">
<input type="text" placeholder="请输入产品名称">
</div>
<scroll
ref="scrollList"
:pullUp="true"
>
<section v-for="(item,index) in lists" :key="index">
<div class="descript" @click="goDetails(item.product_plan_id)">
<img src="@/assets/trial/product.png" alt="">
<p class="produc">{{ item.product_plan_id_n }}</p>
<img class="linkPic" src="@/assets/distributorSign/righticon.png" alt="">
</div>
<h-content>
<scroll
ref="scrollList"
>
<div class="tario">
<div class="wrap">
<p class="ratio">
<span>保证金比例</span>
<span>{{ item.deposit_ratio_n }}</span>
</p>
<p>
<span>手续费比例</span>
<span>{{ item.lease_charge_ratio_n }}</span>
</p>
<section v-for="(item,index) in lists" :key="index">
<div class="descript" @click="goDetails(item.product_plan_id)">
<img src="@/assets/trial/product.png" alt="">
<p class="produc">{{ item.product_plan_id_n }}</p>
<img class="linkPic" src="@/assets/distributorSign/righticon.png" alt="">
</div>
<div class="wrap">
<p>
<span>年利率</span>
<span>{{ item.int_rate_n }}</span>
</p>
<p>
<span>期&nbsp;&nbsp;&nbsp;限</span>
<span>{{ item.lease_times }}期</span>
</p>
<div class="tario">
<div class="wrap">
<p class="ratio">
<span>保证金比例</span>
<span>{{ item.deposit_ratio_n }}</span>
</p>
<p>
<span>手续费比例</span>
<span>{{ item.lease_charge_ratio_n }}</span>
</p>
</div>
<div class="wrap">
<p>
<span>年利率</span>
<span>{{ item.int_rate_n }}</span>
</p>
<p>
<span>期&nbsp;&nbsp;&nbsp;限</span>
<span>{{ item.lease_times }}期</span>
</p>
</div>
</div>
</div>
</section>
</scroll>
</section>
</scroll>
</h-content>
</h-view>
</template>
......@@ -111,7 +110,6 @@ export default {
let param = {}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
console.log(res)
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.lists = res.lists
......@@ -139,40 +137,67 @@ export default {
line-height: 24px;
}
}
.hinput {
position: relative;
z-index: 50;
.search {
background-color: #fff;
padding: 8px 12px;
position: relative;
margin-bottom: 8px;
input {
background: rgba(239,239,239,0.55);
padding-left: 12px;
border-radius: 4px;
height: 36px;
width: 100%;
height: 50px;
//border-bottom: 1px solid #cccccc70;
display: flex;
justify-content: center;
align-items: center;
background: #fff;
.search-box {
width: 93.6%;
height: 36px;
font-size: 14px;
color: #B4B4B5;
letter-spacing: 0;
font-family: PingFangSC-Regular;
border: 1px solid #1D3FFF;
border-radius: 4px;
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
font-family: PingFangSC-Regular;
font-size: 14px;
color: #888C8F;
}
input {
width: 90%;
height: 100%;
opacity: 0.4;
border: none;
line-height: 34px;
}
}
input::placeholder {
font-size: 14px;
color: #888C8F;
}
img {
position: absolute;
height: 16px;
right: 25px;
top: 20px;
}
}
// .hinput {
// position: relative;
// z-index: 50;
// width: 100%;
// height: 50px;
// //border-bottom: 1px solid #cccccc70;
// display: flex;
// justify-content: center;
// align-items: center;
// background: #fff;
// .search-box {
// width: 93.6%;
// height: 36px;
// font-size: 14px;
// color: #B4B4B5;
// letter-spacing: 0;
// font-family: PingFangSC-Regular;
// border: 1px solid #1D3FFF;
// border-radius: 4px;
// display: flex;
// flex-direction: row;
// justify-content: center;
// align-items: center;
// input {
// width: 90%;
// height: 100%;
// opacity: 0.4;
// border: none;
// line-height: 34px;
// }
// }
// }
section {
width: 95%;
margin: 0 auto;
......
src/pages/financingTrial/trial-repay-plan.vue
View file @ edef3e41
......@@ -121,7 +121,6 @@ export default {
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
console.log(res)
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.info = res.info
......
src/pages/home/functionState.js
View file @ edef3e41
......@@ -2,7 +2,7 @@
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-24 12:34:06
* @LastEditTime: 2019-10-29 13:37:18
* @LastEditTime: 2019-10-31 10:35:01
* @LastEditors: Please set LastEditors
*/
export default {
......@@ -26,7 +26,7 @@ export default {
'moduleIcon': require('@/assets/homePage/product-trial.png'),
},
{
'moduleState': '',
'moduleState': 'ContractRecords',
'moduleName': '合同查询',
'moduleIcon': require('@/assets/homePage/contract-query.png'),
},
......
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