Commit 01e0e733 authored by linxin's avatar linxin

Merge branch 'liuxin' into develop

parents 0da97848 aea64900
......@@ -57,7 +57,7 @@ export default {
{
functionIcon: require('@/assets/intoApproval/introduce.png'),
functionName: '进件审批',
functionState: 'Base',
functionState: 'IntoList',
},
{
functionIcon: require('@/assets/intoApproval/introduce.png'),
......
<template>
<div @click="changeRoute">
进件审批
</div>
</template>
<script>
export default {
methods: {
changeRoute () {
this.$router.push(
{
name: 'Base',
}
)
},
},
}
</script>
<style scoped>
div{
width: 100px;
height: 100px;
border:2px solid #ccc;
text-align: center;
line-height: 100px;
margin:0 auto;
}
</style>
......@@ -45,65 +45,170 @@
</h-header>
<Tab @getTabNum="getTabNum" />
<h-content class="content">
<div v-show="tabNum==0">
<div v-if="tabNum==0&&bp_class=='NP'">
<list-item :item-height="44">
<item>
<div slot="name">业务经办</div>
<input slot="content" v-model="baseInfo.bp_name_sp" readonly >
<input slot="content" v-model="personInfo.bp_id_user" readonly >
</item>
<item>
<div slot="name">经销商</div>
<input slot="content" v-model="baseInfo.spouse_phone" >
<input slot="content" v-model="personInfo.bp_id_agent" >
</item>
</list-item>
<div class="userInfo">承租人信息</div>
<list-item :item-height="44">
<item>
<div slot="name">姓名</div>
<input slot="content" v-model="baseInfo.bp_name_sp" readonly >
<input slot="content" v-model="personInfo.bp_name" readonly >
</item>
<item>
<div slot="name">证件号</div>
<input slot="content" v-model="baseInfo.spouse_phone" readonly >
<input slot="content" v-model="personInfo.id_card_no" readonly >
</item>
<item>
<div slot="name">电话号码</div>
<input slot="content" v-model="baseInfo.working_place_sp" readonly >
<input slot="content" v-model="personInfo.cell_phone" readonly >
</item>
<item>
<div slot="name">居住地址</div>
<input slot="content" v-model="baseInfo.address_sp" readonly >
<input slot="content" v-model="personInfo.living_address" readonly >
</item>
<item>
<div slot="name">户籍地址</div>
<input slot="content" v-model="baseInfo.working_place_sp" readonly >
<input slot="content" v-model="personInfo.address_on_resident_booklit" readonly >
</item>
<item>
<div slot="name">学历</div>
<input slot="content" v-model="baseInfo.address_sp" readonly >
<input slot="content" v-model="personInfo.academic_background_n" readonly >
</item>
<item>
<div slot="name">婚姻状况</div>
<input slot="content" v-model="baseInfo.address_sp" readonly >
<input slot="content" v-model="personInfo.marital_status_n" readonly >
</item>
</list-item>
<div class="userInfo">配偶信息</div>
<list-item :item-height="44">
<item>
<div slot="name">姓名</div>
<input slot="content" v-model="baseInfo.bp_name_sp" readonly >
<input slot="content" v-model="personInfo.bp_name_sp" readonly >
</item>
<item>
<div slot="name">电话号码</div>
<input slot="content" v-model="baseInfo.working_place_sp" readonly >
<input slot="content" v-model="personInfo.spouse_phone" readonly >
</item>
<item>
<div slot="name">工作单位</div>
<input slot="content" v-model="baseInfo.address_sp" readonly >
<input slot="content" v-model="personInfo.working_place_sp" readonly >
</item>
<item>
<div slot="name">居住地址</div>
<input slot="content" v-model="baseInfo.working_place_sp" readonly >
<input slot="content" v-model="personInfo.address_sp" readonly >
</item>
</list-item>
<div class="userInfo">担保人信息</div>
<list-item :item-height="76">
<item>
<div slot="name">
<span class="name-box">1</span>
<span class="name">担保人1姓名</span>
<span class="card-num">证件号</span>
</div>
<div slot="content" class="right">
<img src="@/assets/intoApproval/introduce.png" >
<span>张天</span>
<br >
<span>42112029870928097</span>
</div>
</item>
<item>
<div slot="name">
<span class="name-box">1</span>
<span class="name">担保人1姓名</span>
<span class="card-num">证件号</span>
</div>
<div slot="content" class="right">
<img src="@/assets/intoApproval/introduce.png" >
<span>张天</span>
<br >
<span>42112029870928097</span>
</div>
</item>
</list-item>
<div class="alert">
<div class="alert-content">
<div class="title">
<img src="@/assets/intoApproval/info.png" >
<span class="info-word">温馨提示</span>
</div>
<p class="top-info">绑定成功后,您即可使用APP中合同查询、还款查询等功能。</p>
<div class="top-word">
<p>本人保证所提供信息的真实性、完整性及准确性。</p>
<p>本人在此授权徐工融资租赁有限公司通过中国人民银行个人信用信息基础数据库及其他征信机构、金融机构查询本人的个人信息、信用记录和工作情况。</p>
<p>本人同意接收来自于徐工融资租赁有限公司或第三方发出的提醒付款、确认付款、催款等短信(不含广告),同意接收来自于徐工融资租赁有限公司的录音电话,并积极配合。</p>
</div>
</div>
</div>
</div>
<div v-if="tabNum==0&&bp_class=='ORG'">
<list-item :item-height="44">
<item>
<div slot="name">业务经办</div>
<input slot="content" v-model="companyInfo.bp_id_user" readonly >
</item>
<item>
<div slot="name">经销商</div>
<input slot="content" v-model="companyInfo.bp_id_agent" >
</item>
</list-item>
<div class="userInfo">承租人信息</div>
<list-item :item-height="44">
<item>
<div slot="name">公司名称</div>
<input slot="content" v-model="companyInfo.bp_name" readonly >
</item>
<item>
<div slot="name">营业执照号</div>
<input slot="content" v-model="companyInfo.business_license_num" readonly >
</item>
<item>
<div slot="name">注册资本</div>
<input slot="content" v-model="companyInfo.registered_capital" readonly >
</item>
<item>
<div slot="name">注册地址</div>
<input slot="content" v-model="companyInfo.registered_place" readonly >
</item>
<item>
<div slot="name">经营地址</div>
<input slot="content" v-model="companyInfo.business_address" readonly >
</item>
<item>
<div slot="name">固定电话</div>
<input slot="content" v-model="companyInfo.phone" readonly >
</item>
<item>
<div slot="name">是否授权</div>
<input slot="content" v-model="companyInfo.auth_flag" readonly >
</item>
</list-item>
<div class="userInfo">法人授权信息</div>
<list-item :item-height="44">
<item>
<div slot="name">姓名</div>
<input slot="content" v-model="companyInfo.auth_person_name" readonly >
</item>
<item>
<div slot="name">身份证</div>
<input slot="content" v-model="companyInfo.auth_person_id_card" readonly >
</item>
<item>
<div slot="name">公司职务</div>
<input slot="content" v-model="companyInfo.auth_person_position" readonly >
</item>
<item>
<div slot="name">授权事项</div>
<input slot="content" v-model="companyInfo.auth_person_matter" readonly >
</item>
</list-item>
<div class="userInfo">担保人信息</div>
......@@ -202,16 +307,41 @@ export default {
baseInfo: {},
checkedImg: checkedImg,
isDown: false,
bp_class: this.$route.params.bp_class,
personInfo: {
bp_name_sp: '',
id_card_no: '',
living_address: '',
academic_background_n: '',
address_sp: '',
spouse_phone: '',
marital_status_n: '',
cell_phone: '',
marital_status: '',
bp_name: '',
address_on_resident_booklit: '',
working_place_sp: '',
academic_background: '',
bp_id_agent: '',
bp_id_user: '',
},
companyInfo: {
business_address: '',
auth_person_matter: '',
registered_capital: '',
auth_person_name: '',
auth_flag: '',
bp_name: '',
registered_place: '',
phone: '',
auth_person_position: '',
auth_person_id_card: '',
},
}
},
mounted () {
this.popProtocol()
},
// beforeRouteEnter (to, from, next) {
// next(vm => {
// vm.popProtocol()
// })
// },
methods: {
getTabNum (i) {
this.tabNum = i
......@@ -221,7 +351,6 @@ export default {
},
select () {
this.ischecked = !this.ischecked
console.log(this.ischecked)
},
confirm () {
this.isConfirm = true
......@@ -275,7 +404,6 @@ export default {
font-size: 15px;
margin-left: 16px;
position: relative;
top: 5px;
}
.userInfo::before {
content: "";
......
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-25 11:10:34
* @LastEditTime: 2019-09-25 21:05:24
* @LastEditors: Please set LastEditors
-->
<template>
<div class="tab-style">
<span :class="tabNum == 0?'check':'uncheck'" @click="tabNum = 0;sendTabNum()"><img :src="tabNum == 0?check1:uncheck1">待审批</span>
<span :class="tabNum == 1?'check':'uncheck'" @click="tabNum = 1;sendTabNum()"><img :src="tabNum == 1?check2:uncheck2" >已审批</span>
</div>
</template>
<script>
import check1 from '@/assets/intoApproval/checkF.png'
import check2 from '@/assets/intoApproval/checkS.png'
import uncheck1 from '@/assets/intoApproval/uncheckF.png'
import uncheck2 from '@/assets/intoApproval/uncheckS.png'
export default {
data () {
return {
tabNum: 0,
check1: check1,
check2: check2,
uncheck1: uncheck1,
uncheck2: uncheck2,
}
},
methods: {
sendTabNum () {
this.$emit('getTabNum', this.tabNum)
},
},
}
</script>
<style lang="less" scoped>
.tab-style{
position: relative;
z-index: 50;
background-color: #fff;
display:flex;
// justify-content: center;
padding-top:12px;
padding-bottom: 8px;
align-items: center;
background: #fff;
box-shadow:0 2px 3px 0 rgba(220,220,221,0.50);
span{
display: block;
width:45.9%;
height: 32px;
border-radius:16px;
text-align: center;
line-height: 32px;
}
span:nth-of-type(1){
margin-left: 12px
}
img{
width:14px;
height: 14px;
}
span:nth-of-type(2){
margin-left:7px;
}
.check{
color:#00469C;
background-color:rgba(0,70,156,0.10);
}
.uncheck{
color:#383F45 ;
background: rgba(220,220,221,0.26);
}
}
</style>
......@@ -107,6 +107,7 @@ export default {
font-size: 15px;
margin-left: 16px;
position: relative;
top:5px;
}
.userInfo::before {
content: "";
......
<template>
<h-view id="sign" 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>
</div>
</h-header>
<Tab @getTabNum="getTabNum" />
<h-content>
<div class="hinput">
<div class="search-box">
<input type="text" placeholder="请输入进件号/承租人名称">
<img src="@/assets/distributorSign/search.png" alt="">
</div>
</div>
<div v-for="(item,index) in contractMsg" :key="index" class="contract-list">
<div class="item">
<img src="@/assets/distributorSign/icon-进件合同.png" alt="">
<p class="incoming-num">进件号</p>
<p class="code">{{ item.code }}</p>
</div>
<div class="details" @click="goDetails(index)">
<div class="option">
<p class="name">承租人</p>
<p class="full-name normal">{{ item.name }}</p>
</div>
<div class="option">
<p class="name">合同租金</p>
<p class="normal money">{{ item.money }}</p>
<img src="@/assets/distributorSign/goDetails.png" alt="" @click="goDetails(index)">
</div>
<div class="option">
<p class="name">申请时间</p>
<p class="normal">{{ item.date }}</p>
</div>
</div>
</div>
</h-content>
</h-view>
</template>
<script>
import Tab from '@/pages/intoApproval/intoApproval/intoTab'
export default {
name: 'ContractList',
components: {
Tab,
},
data () {
return {
tabNum: 0,
contractMsg: [
{name: '张三', money: 9000000, date: '2019-03-1', code: '201903022001'},
{name: '李四', money: 9000000, date: '2019-03-1', code: '201903022002'},
{name: '王五', money: 9000000, date: '2019-03-1', code: '201903022003'},
{name: '赵六', money: 9000000, date: '2019-03-1', code: '201903022004'},
{name: '张三', money: 9000000, date: '2019-03-1', code: '201903022001'},
{name: '李四', money: 9000000, date: '2019-03-1', code: '201903022002'},
{name: '王五', money: 9000000, date: '2019-03-1', code: '201903022003'},
{name: '赵六', money: 9000000, date: '2019-03-1', code: '201903022004'},
],
}
},
methods: {
getTabNum (i) {
this.tabNum = i
},
goDetails () {
this.$router.push({
name: 'Base',
params: {
bp_class: 'NP',
},
})
},
},
}
</script>
<style lang="less" scoped>
#sign {
.h-header-btn {
img {
width: 16px;
height: 16px;
margin-left: 4px;
}
span {
font-family: PingFangSC-Semibold;
margin-left: 16px;
font-size: 17px;
letter-spacing: 0.61px;
line-height: 24px;
}
}
.hinput {
width: 100%;
height: 68px;
border-bottom:1px solid #ccc;
display: flex;
justify-content: center;
align-items: center;
margin-top: 3px;
background: #fff;
.search-box {
width: 93.6%;
height: 36px;
font-size: 14px;
color: #B4B4B5;
letter-spacing: 0;
font-family: PingFangSC-Regular;
border: 1px solid rgba(56,63,69,0.60);
border-radius: 4px;
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
input {
width: 90%;height: 100%;
opacity: 0.4;
border: none
}
}
}
.contract-list {
width: 100%;
height: 120px;
// border: 1px solid #ccc;
background: #fff;
// margin-bottom: 18px;
.item {
width: 100%;
height: 34px;
background: rgba(00, 70, 156, 0.1);
display: flex;
flex-direction: row;
align-items: center;
img {
margin-left: 16.6px;
}
.incoming-num {
font-family: PingFangSC-Semibold;
// width: 42px;
height: 20px;
font-weight: bolder;
line-height: 20px;
font-size: 14px;
color: #00469C;
letter-spacing: 0;
margin-left: 8.8px;
}
.code {
font-family: PingFangSC-Semibold;
font-size: 14px;
color: #00469C;
margin-left: 8px;
font-weight: bolder
}
}
.details {
width: 100%;
height: 86px;
display: flex;
flex-direction: column;
justify-content: space-evenly;
.option {
width: 100%;
height: 18px;
display: flex;
flex-basis: row;
.name {
font-family: PingFangSC-Regular;
font-size: 13px;
color: rgba(56,63,69,0.60);
width: 80px;
height: 18px;
line-height: 18px;
text-align: right
}
.normal {
font-family: PingFangSC-Regular;
font-size: 13px;
color: #383F45;
height: 18px;
line-height: 18px;
margin-left: 8px;
}
.money {
color: #FCC800;
}
img {
margin-left: 55%
}
}
}
}
}
</style>
......@@ -29,6 +29,7 @@ import Enterprise from '@/pages/userBind/org/enterprise'
// 进件审批
import Base from '@/pages/intoApproval/intoApproval/base'
import IntoList from '@/pages/intoApproval/intoList'
// 经销商签约
import ContractList from '@/pages/distributorSign/contract-list'
import ContractDetails from '@/pages/distributorSign/contract-details'
......@@ -97,7 +98,8 @@ export default new Router({
{path: '/nature-person', component: NaturePerson, name: 'NaturePerson', meta: {keepAlive: false}},
{path: '/enterprise', component: Enterprise, name: 'Enterprise', meta: {keepAlive: false}},
// 进件审批
{path: '/base', component: Base, name: 'Base', meta: {keepAlive: true}},
{path: '/base', component: Base, name: 'Base', meta: {keepAlive: false}},
{path: '/intoList', component: IntoList, name: 'IntoList', meta: {keepAlive: false}},
// 经销商签约
{path: '/contract-list', component: ContractList, name: 'ContractList', meta: {keepAlive: true}},
{path: '/contract-details', component: ContractDetails, name: 'ContractDetails', meta: {keepAlive: true}},
......
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