Skip to content

H
hls-xcmg-vue-app
Commit e6169e0a authored by linxin's avatar linxin
Browse files
Options

Merge branch 'liuxin' into develop

parents 0e40f4e2 c5c08527
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 907 additions and 241 deletions
src/pages/contractStart/addCar.vue → src/pages/carConfirm/confirm-detail.vue
View file @ e6169e0a
<template> <template>
<h-view id="addCar"> <h-view id="addCar">
<div v-if="downNum" class="modal-show"> <div v-show="downNum" class="modal-show">
<div class="down"> <div class="down">
<div class="top"> <div class="top">
录入产品信息 录入产品信息
...@@ -14,26 +14,22 @@ ...@@ -14,26 +14,22 @@
<list-item :item-height="44"> <list-item :item-height="44">
<item> <item>
<div slot="name">车架号</div> <div slot="name">车架号</div>
<input slot="content" placeholder="自动识别车架号" > <input slot="content" readonly placeholder="自动识别车架号" >
</item> </item>
<item> <item>
<div slot="name">发动机号</div> <div slot="name">发动机号</div>
<input slot="content" placeholder="自动识别发动机号" > <input slot="content" readonly placeholder="自动识别发动机号" >
</item> </item>
<item> <item>
<div slot="name">厂商型号</div> <div slot="name">厂商型号</div>
<input slot="content" class="write" placeholder="请输入厂商型号" > <input slot="content" readonly class="write" placeholder="请输入厂商型号" >
</item> </item>
<item> <item>
<div slot="name">车牌号</div> <div slot="name">车牌号</div>
<input slot="content" placeholder="请输入车牌号" > <input slot="content" readonly placeholder="请输入车牌号" >
</item> </item>
<item :showArrow="true" @click.native="showModalValue=true"> </list-item>
<div slot="name">产品参数</div> </div>
<input slot="content" placeholder="请选择产品参数" >
</item>
</list-item></div>
<button @click="confirm">保存</button>
</div> </div>
</div> </div>
<h-header :proportion="[5,1,1]" class="bar-custom"> <h-header :proportion="[5,1,1]" class="bar-custom">
...@@ -45,37 +41,37 @@ ...@@ -45,37 +41,37 @@
<h-content> <h-content>
<div class="userInfo">承租人信息</div> <div class="userInfo">承租人信息</div>
<list-item :item-height="44"> <list-item :item-height="44">
<item :showArrow="true"> <item>
<div slot="name">合同号</div> <div slot="name">合同号</div>
<input slot="content" placeholder="请选择合同号" > <input slot="content" readonly placeholder="暂无数据" >
</item> </item>
<item :showArrow="true"> <item>
<div slot="name">经销商</div> <div slot="name">经销商</div>
<input slot="content" placeholder="请选择经销商" > <input slot="content" readonly placeholder="暂无数据" >
</item> </item>
<item> <item>
<div slot="name">承租人</div> <div slot="name">承租人</div>
<input slot="content" placeholder="请输入承租人姓名" > <input slot="content" readonly placeholder="暂无数据" >
</item> </item>
<item :showArrow="true"> <item>
<div slot="name">产品线</div> <div slot="name">产品线</div>
<input slot="content" placeholder="请选择产品线" > <input slot="content" readonly placeholder="暂无数据" >
</item> </item>
<item> <item>
<div slot="name">合同金额</div> <div slot="name">合同金额</div>
<input slot="content" placeholder="请输入合同金额" > <input slot="content" readonly placeholder="暂无数据" >
</item> </item>
<item :showArrow="true"> <item>
<div slot="name">商务政策</div> <div slot="name">商务政策</div>
<input slot="content" placeholder="请选择合同政策" > <input slot="content" readonly placeholder="暂无数据" >
</item> </item>
<item> <item>
<div slot="name">租赁物数量</div> <div slot="name">租赁物数量</div>
<input slot="content" v-model="num" placeholder="请输入租赁物数量" > <input slot="content" v-model="num" readonly placeholder="请输入租赁物数量" >
</item> </item>
</list-item> </list-item>
<div class="userInfo">设备清单</div> <div class="userInfo">设备清单</div>
<div v-for="(item,index) in numInt" :key="index" class="equipment"> <div v-for="(item,index) in numInt" :key="index" class="equipment" @click="downNum=true">
<div class="left"> <div class="left">
<span> <span>
<img src="@/assets/contractStart/list.png" > <img src="@/assets/contractStart/list.png" >
...@@ -89,7 +85,7 @@ ...@@ -89,7 +85,7 @@
<span>GTZ226</span> <span>GTZ226</span>
</p> </p>
</div> </div>
<div class="right" @click="downNum=true"> <div class="right">
<img src="@/assets/contractStart/into.png" > <img src="@/assets/contractStart/into.png" >
</div> </div>
</div> </div>
...@@ -97,17 +93,7 @@ ...@@ -97,17 +93,7 @@
<bottom-tab> <bottom-tab>
<tab-button class="approve" @click.native="goAdd">发车申请</tab-button> <tab-button class="approve" @click.native="goAdd">发车申请</tab-button>
</bottom-tab> </bottom-tab>
<h-modal ref="modal" v-model="showModalValue" position="bottom" cus-class="sign-modal">
<h-view>
<h-header style="height: 43px !important;padding-top:0px">
<div slot="left" class="h-header-btn">确定</div>
<div slot="right" class="h-header-btn">清除</div>
</h-header>
<h-content style="top:44px !important;">
<div id="draw" class="draw"/>
</h-content>
</h-view>
</h-modal>
</h-view> </h-view>
</template> </template>
<script> <script>
...@@ -116,7 +102,8 @@ export default { ...@@ -116,7 +102,8 @@ export default {
return { return {
num: null, num: null,
downNum: false, downNum: false,
showModalValue: false, show: false,
products: [],
} }
}, },
computed: { computed: {
...@@ -128,6 +115,8 @@ export default { ...@@ -128,6 +115,8 @@ export default {
} }
}, },
}, },
methods: {
},
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
...@@ -135,11 +124,24 @@ export default { ...@@ -135,11 +124,24 @@ export default {
input::placeholder { input::placeholder {
color: #888c8f; color: #888c8f;
} }
.hide{
display: flex;
justify-content: flex-start;
align-items: center;
img{
width:30px;
height:30px;
margin-left:65%;
}
}
.wrap{
padding-top:92px;
}
.modal-show { .modal-show {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: absolute; position: absolute;
z-index: 999; z-index: 900;
background-color: rgba(56, 63, 69, 0.3); background-color: rgba(56, 63, 69, 0.3);
display: flex; display: flex;
justify-content: center; justify-content: center;
...@@ -147,7 +149,7 @@ export default { ...@@ -147,7 +149,7 @@ export default {
.down { .down {
position: relative; position: relative;
width: 314px; width: 314px;
height: 516px; height: 436px;
background-size: 301px 24.7px; background-size: 301px 24.7px;
background-color: #fff; background-color: #fff;
} }
...@@ -185,24 +187,14 @@ export default { ...@@ -185,24 +187,14 @@ export default {
border-radius: 2px; border-radius: 2px;
margin: 0 auto; margin: 0 auto;
margin-top: 12px; margin-top: 12px;
background:url('../../assets/contractStart/photo.png') 70px no-repeat; background: url("../../assets/contractStart/photo.png") 70px no-repeat;
background-size:24px 20px; background-size: 24px 20px;
img{ img {
width:100%; width: 100%;
height:100%; height: 100%;
} }
} }
} }
button {
width: 240px;
height: 40px;
position: absolute;
color: #fff;
bottom: 16px;
left: 30.5px;
background-color: #0041c4;
border-radius: 4px;
}
} }
.userInfo { .userInfo {
height: 45px; height: 45px;
......
src/pages/carConfirm/confirm-list.vue 0 → 100644
View file @ e6169e0a
<template>
<h-view id="startList">
<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" />
<div class="search">
<input placeholder="请输入合同号/产品线/承租人名称" >
</div>
<h-content class="my-content">
<scroll
ref="scroll"
:updateData="[contructs]"
:pullUp="true"
@pullingUp="loadMore"
>
<div v-for="(item,index) in 6" :key="index" class="item" @click="changePage">
<div class="left">
<span>
<img src="@/assets/contractStart/icon.png" >
</span>
</div>
<div class="right">
<div class="right-top">
<span>合同号</span>
<span>CON201903022001</span>
</div>
<div class="right-bottom">
<ul>
<li>
承租人
<span>张三</span>
</li>
<li>
产品线
<span>起重机</span>
</li>
<li>
合同金额
<span class="number">{{ 900000|currency }}</span>
</li>
</ul>
</div>
</div>
</div>
</scroll>
</h-content>
</h-view>
</template>
<script>
import Tab from '@/pages/contractStart/tab'
export default {
components: {
Tab,
},
data () {
return {
contructs: [],
}
},
methods: {
getTabNum (i) {
},
changePage () {
this.$router.push({
name: 'ConfirmDetail',
})
},
},
}
</script>
<style lang="less" scoped>
#startList {
.search {
height: 52px;
background-color: #fff;
display: flex;
align-items: center;
justify-content: center;
input {
width: 351px;
height: 36px;
line-height: 36px;
text-indent: 16px;
font-family: PingFangSC-Regular;
font-size: 14px;
color: #21254c;
letter-spacing: 0;
border-radius: 4px;
background: url("../../assets/contractStart/search1.png") 320px no-repeat;
background-size: 16px 16px;
background-color: rgba(239, 239, 239, 0.55);
}
input::placeholder {
font-family: PingFangSC-Regular;
font-size: 14px;
color: #888c8f;
letter-spacing: 0;
}
input:focus {
background: url("../../assets/contractStart/search2.png") 320px no-repeat;
background-size: 16px 16px;
background-color: rgba(239, 239, 239, 0.55);
border: 2px solid #bcc6ff;
}
}
.my-content {
.item {
width: 359px;
height: 148px;
background-color: #fff;
border-radius: 2px;
margin: 0 auto;
margin-top: 9px;
.left {
width: 15%;
height: 100%;
float: left;
span {
display: block;
width: 30px;
height: 30px;
background-color: #e8e9ed;
border-radius: 8px;
display: flex;
align-items: center;
justify-content: center;
margin-left: 10px;
margin-top: 8px;
img {
width: 11px;
height: 14px;
}
}
}
.right {
height: 100%;
width: 85%;
float: right;
.right-top {
width: 285px;
height: 45px;
font-family: PingFangSC-Semibold;
font-size: 15px;
color: #4b4a4b;
letter-spacing: 0;
line-height: 45px;
border-bottom: 1px solid #f3f3f7;
span:last-child {
float: right;
}
}
.right-bottom {
width: 285px;
margin-top: 10px;
.number {
font-family: Verdana-Bold;
font-size: 14px;
color: #4b4a4b;
letter-spacing: 0;
font-weight:bold;
}
li {
font-family: PingFangSC-Regular;
font-size: 14px;
color: #4b4a4b;
letter-spacing: 0;
height: 30px;
width: 100%;
span {
float: right;
}
}
}
}
}
}
}
</style>
src/pages/contractRepayment/contract-repayment.vue
View file @ e6169e0a
...@@ -8,17 +8,17 @@ ...@@ -8,17 +8,17 @@
</h-header> </h-header>
<h-content v-if="data!==null" class="pay-content"> <h-content v-if="data!==null" class="pay-content">
<div v-for="(item,index) in 6" :key="index" class="contract-item"> <div v-for="(item,index) in lists" :key="index" class="contract-item">
<div class="header"> <div class="header">
<img src="@/assets/contractRepayment/contract.png" alt=""> <img src="@/assets/contractRepayment/contract.png" alt="">
<h2>CON201903022001</h2> <h2>{{ item.project_number }}</h2>
<!-- 状态用类名控制 待还款orange,待签约blue,还款中green --> <!-- 状态用类名控制 待还款orange,待签约blue,还款中green -->
<p class="orange">待还款</p> <p class="orange">待还款</p>
</div> </div>
<div class="center"> <div class="center">
<div><span>合同金额</span><p>90,000.00</p></div> <div><span>合同金额</span><p>{{ item.total_price|currency }}</p></div>
<div><span>已还金额</span><p class="bold">0.00</p></div> <div><span>已还金额</span><p class="bold">{{ item.recivied_amount|currency }}</p></div>
<span class="red">逾期一周</span> <span class="red">逾期{{ item.overdue_days }}天</span>
<section @click="toRepayDetails"> <section @click="toRepayDetails">
<img src="@/assets/contractRepayment/view.png" alt=""> <img src="@/assets/contractRepayment/view.png" alt="">
<span>查看合同明细</span> <span>查看合同明细</span>
...@@ -45,12 +45,57 @@ export default { ...@@ -45,12 +45,57 @@ export default {
data () { data () {
return { return {
// data: null, 无记录时 // data: null, 无记录时
data: 1, lists: [{
'total_price': '150000',
'recivied_amount': '50000',
'overdue_days': 'AA',
'repayment_status': 'BB',
'project_number': 'PRJ2019118',
'project_id': '48871',
}, {
'total_price': '200000',
'recivied_amount': '60000',
'overdue_days': 'AA',
'repayment_status': 'BB',
'project_number': 'PRJ2019128',
'project_id': '48612',
}],
} }
}, },
computed: {}, computed: {
data () {
if (this.lists.length === 0) {
return null
} else {
return 1
}
},
},
watch: {}, watch: {},
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'HomePage') {
// vm.getList()
}
})
},
methods: { methods: {
getList () {
let vm = this
let url = process.env.basePath + 'con_repayment_list_query'
let param = {
user_phone: window.localStorage.getItem('user_phone'),
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.lists = res.lists
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
toRepayDetails () { toRepayDetails () {
this.$router.push({ this.$router.push({
name: 'RepayDetails', name: 'RepayDetails',
......
src/pages/contractRepayment/repay-details.vue
View file @ e6169e0a
...@@ -42,23 +42,23 @@ ...@@ -42,23 +42,23 @@
</list-item> </list-item>
<div class="header">设备清单</div> <div class="header">设备清单</div>
<list-item :item-height="104" class="equipment-list"> <list-item :item-height="104" class="equipment-list">
<item v-for="(item,index) in 4" :proportion="[2,1]" :key="index"> <item v-for="(item,index) in lists" :proportion="[2,1]" :key="index">
<div slot="name" class="parameters"> <div slot="name" class="parameters">
<div class="list"> <div class="list">
<p>参数项</p> <p>参数项</p>
<span class="bold">JC1213</span> <span class="bold">{{ item.product_code }}</span>
</div> </div>
<div class="list"> <div class="list">
<p>发动机号</p> <p>发动机号</p>
<span>JC12131111</span> <span>{{ item.lease_item_engine_num }}</span>
</div> </div>
<div class="list"> <div class="list">
<p>厂商型号</p> <p>厂商型号</p>
<span>****</span> <span>{{ item.lease_item_factory_num }}</span>
</div> </div>
<div class="list"> <div class="list">
<p>车牌号</p> <p>车牌号</p>
<span>********</span> <span>{{ item.lease_item_car_num }}</span>
</div> </div>
</div> </div>
<div slot="content"> <div slot="content">
...@@ -83,16 +83,36 @@ export default { ...@@ -83,16 +83,36 @@ export default {
data () { data () {
return { return {
detailInfo: {}, detailInfo: {},
lists: [],
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
next(vm => { next(vm => {
vm.getDetail() if (from.name === 'ContractRepayment') {
vm.getDetail()
vm.getEquipment()
}
}) })
}, },
methods: { methods: {
getEquipment () {
let vm = this
let url = process.env.basePath + 'con_equip_list'
let param = {
project_id: 46002,
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.lists = res.lists
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
getDetail () { getDetail () {
let vm = this let vm = this
let url = process.env.basePath + 'con_repayment_detial' let url = process.env.basePath + 'con_repayment_detial'
......
src/pages/contractStart/add-car.vue 0 → 100644
View file @ e6169e0a
This diff is collapsed.
src/pages/contractStart/startList.vue → src/pages/contractStart/start-list.vue
View file @ e6169e0a
...@@ -11,65 +11,43 @@ ...@@ -11,65 +11,43 @@
<input placeholder="请输入合同号/产品线/承租人名称" > <input placeholder="请输入合同号/产品线/承租人名称" >
</div> </div>
<h-content class="my-content"> <h-content class="my-content">
<div class="item"> <scroll
<div class="left"> ref="scroll"
<span> :updateData="[contructs]"
<img src="@/assets/contractStart/icon.png" > :pullUp="true"
</span> @pullingUp="loadMore"
</div> >
<div class="right"> <div v-for="(item,index) in 6" :key="index" class="item" @click="changePage">
<div class="right-top"> <div class="left">
<span>合同号</span> <span>
<span>CON201903022001</span> <img src="@/assets/contractStart/icon.png" >
</span>
</div> </div>
<div class="right-bottom"> <div class="right">
<ul> <div class="right-top">
<li> <span>合同号</span>
承租人 <span>CON201903022001</span>
<span>张三</span> </div>
</li> <div class="right-bottom">
<li> <ul>
产品线 <li>
<span>起重机</span> 承租人
</li> <span>张三</span>
<li> </li>
合同金额 <li>
<span class="number">{{ 900000|currency }}</span> 产品线
</li> <span>起重机</span>
</ul> </li>
<li>
合同金额
<span class="number">{{ 900000|currency }}</span>
</li>
</ul>
</div>
</div> </div>
</div> </div>
</div>
<div class="item"> </scroll></h-content>
<div class="left">
<span>
<img src="@/assets/contractStart/icon.png" >
</span>
</div>
<div class="right">
<div class="right-top">
<span>合同号</span>
<span>CON201903022001</span>
</div>
<div class="right-bottom">
<ul>
<li>
承租人
<span>张三</span>
</li>
<li>
产品线
<span>起重机</span>
</li>
<li>
合同金额
<span class="number">{{ 900000|currency }}</span>
</li>
</ul>
</div>
</div>
</div>
</h-content>
<bottom-tab> <bottom-tab>
<tab-button class="add" @click.native="goAdd"> <tab-button class="add" @click.native="goAdd">
新增发车 新增发车
...@@ -83,6 +61,11 @@ export default { ...@@ -83,6 +61,11 @@ export default {
components: { components: {
Tab, Tab,
}, },
data () {
return {
contructs: [],
}
},
methods: { methods: {
getTabNum (i) { getTabNum (i) {
}, },
...@@ -91,6 +74,11 @@ export default { ...@@ -91,6 +74,11 @@ export default {
name: 'AddCar', name: 'AddCar',
}) })
}, },
changePage () {
this.$router.push({
name: 'AddCar',
})
},
}, },
} }
</script> </script>
......
src/pages/infoCenter/infoList.vue → src/pages/infoCenter/info-list.vue
View file @ e6169e0a
...@@ -74,8 +74,6 @@ export default { ...@@ -74,8 +74,6 @@ export default {
font-size: 12px; font-size: 12px;
color: rgba(56, 63, 69, 0.6); color: rgba(56, 63, 69, 0.6);
flex:6; flex:6;
// margin-left: 160px;
// margin-right:-160px;
} }
} }
.arrow{ .arrow{
......
src/pages/intoApproval/intoList.vue → src/pages/intoApproval/into-list.vue
View file @ e6169e0a
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</div> </div>
<div class="option"> <div class="option">
<p class="name">合同金额</p> <p class="name">合同金额</p>
<p class="normal money">{{ item.total_price|NumFormat }}</p> <p class="normal money">{{ item.total_price|currency }}</p>
<img src="@/assets/distributorSign/goDetails.png" alt=""> <img src="@/assets/distributorSign/goDetails.png" alt="">
</div> </div>
<div class="option"> <div class="option">
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
</h-view> </h-view>
</template> </template>
<script> <script>
import Tab from '@/pages/intoApproval/intoApproval/intoTab' import Tab from '@/pages/intoApproval/intoApproval/into-tab'
export default { export default {
name: 'ContractList', name: 'ContractList',
components: { components: {
...@@ -92,25 +92,6 @@ export default { ...@@ -92,25 +92,6 @@ export default {
} }
return `${y}-${m}-${d}` return `${y}-${m}-${d}`
}, },
'NumFormat': function (value) {
if (!value) return '0.00'
var intPart = Number(value) | 0 // 获取整数部分
var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断
var floatPart = '.00' // 预定义小数部分
var value2Array = value.split('.')
// =2表示数据有小数位
if (value2Array.length === 2) {
floatPart = value2Array[1].toString() // 拿到小数部分
if (floatPart.length === 1) { // 补0,实际上用不着
return intPartFormat + '.' + floatPart + '0'
} else {
return intPartFormat + '.' + floatPart
}
} else {
return intPartFormat + floatPart
}
},
}, },
data () { data () {
return { return {
...@@ -127,33 +108,14 @@ export default { ...@@ -127,33 +108,14 @@ export default {
watch: { watch: {
'tabNum': function (newVal, oldVal) { 'tabNum': function (newVal, oldVal) {
if (newVal === 0) { if (newVal === 0) {
// this.showList = this.unConfirm
this.showList = this.contractMsg this.showList = this.contractMsg
} else if (newVal === 1) { } else if (newVal === 1) {
// this.showList = this.confirm
this.showList = this.contractMsg this.showList = this.contractMsg
} }
}, },
'keyWords': function (newVal, oldVal) { 'keyWords': function (newVal, oldVal) {
let newL = [] let newL = []
let vm = this let vm = this
// let newList = []
// let newListConfirmed = []
// if (this.tabNum === 0) {
// this.unConfirm.forEach(item => {
// if (item.bp_name.indexOf(newVal) !== -1 || item.project_number.indexOf(newVal) !== -1) {
// newList.push(item)
// }
// })
// this.showList = newList
// } else if (this.tabNum === 1) {
// this.confirm.forEach(item => {
// if (item.bp_name.indexOf(newVal) !== -1 || item.project_number.indexOf(newVal) !== -1) {
// newListConfirmed.push(item)
// }
// })
// this.showList = newListConfirmed
// }
vm.contractMsg.forEach(item => { vm.contractMsg.forEach(item => {
if (item.bp_name.indexOf(newVal) !== -1 || item.project_number.indexOf(newVal) !== -1) { if (item.bp_name.indexOf(newVal) !== -1 || item.project_number.indexOf(newVal) !== -1) {
...@@ -186,9 +148,6 @@ export default { ...@@ -186,9 +148,6 @@ export default {
vm.contractMsg = res.lists vm.contractMsg = res.lists
vm.showList = res.lists vm.showList = res.lists
// vm.showList = res.lists.filter(item => {
// return item.confirm_status === 'SUBMIT'
// })
} }
}) })
}, },
...@@ -279,9 +238,7 @@ export default { ...@@ -279,9 +238,7 @@ export default {
.contract-list { .contract-list {
width: 100%; width: 100%;
height: 120px; height: 120px;
// border: 1px solid #ccc;
background: #fff; background: #fff;
// margin-bottom: 18px;
.item { .item {
width: 100%; width: 100%;
height: 34px; height: 34px;
...@@ -294,7 +251,6 @@ export default { ...@@ -294,7 +251,6 @@ export default {
} }
.incoming-num { .incoming-num {
font-family: PingFangSC-Semibold; font-family: PingFangSC-Semibold;
// width: 42px;
height: 20px; height: 20px;
font-weight: bolder; font-weight: bolder;
line-height: 20px; line-height: 20px;
...@@ -350,7 +306,6 @@ export default { ...@@ -350,7 +306,6 @@ export default {
} }
.option:nth-of-type(2) { .option:nth-of-type(2) {
position: relative; position: relative;
// left: 0;
img{ img{
position: absolute; position: absolute;
right: 10px; right: 10px;
......
src/pages/intoApproval/intoApproval/base.vue
View file @ e6169e0a
...@@ -374,7 +374,7 @@ ...@@ -374,7 +374,7 @@
</template> </template>
<script> <script>
import Tab from '@/pages/intoApproval/intoApproval/tab' import Tab from '@/pages/intoApproval/intoApproval/tab'
import RentInfo from '@/pages/intoApproval/intoApproval/rentInfo' import RentInfo from '@/pages/intoApproval/intoApproval/rent-info'
import AccessoryInfo from '@/pages/intoApproval/intoApproval/accessory' import AccessoryInfo from '@/pages/intoApproval/intoApproval/accessory'
import checkedImg from '@/assets/intoApproval/checked.png' import checkedImg from '@/assets/intoApproval/checked.png'
export default { export default {
...@@ -463,7 +463,6 @@ export default { ...@@ -463,7 +463,6 @@ export default {
if (this.confirm_status !== 'APPROVED') { if (this.confirm_status !== 'APPROVED') {
this.popProtocol() this.popProtocol()
} }
// this.getList()
this.isConfirm = this.$route.params.isConfirm this.isConfirm = this.$route.params.isConfirm
}, },
methods: { methods: {
...@@ -579,9 +578,6 @@ export default { ...@@ -579,9 +578,6 @@ export default {
title: '提示', title: '提示',
content: `您确认${val}吗？`, content: `您确认${val}吗？`,
onConfirm: (data) => { onConfirm: (data) => {
// if (val === '拒绝') {
// } else {
if (data) { if (data) {
let vm = this let vm = this
let url = process.env.basePath + 'do_confrim_bp' let url = process.env.basePath + 'do_confrim_bp'
...@@ -605,7 +601,6 @@ export default { ...@@ -605,7 +601,6 @@ export default {
} }
}) })
} }
// }
}, },
}) })
}, },
...@@ -738,7 +733,6 @@ export default { ...@@ -738,7 +733,6 @@ export default {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
width: 150px; width: 150px;
// margin-top: -10px;
} }
.right span:last-child { .right span:last-child {
margin-top: 7px; margin-top: 7px;
......
src/pages/intoApproval/intoApproval/intoTab.vue → src/pages/intoApproval/intoApproval/into-tab.vue
View file @ e6169e0a
...@@ -80,7 +80,6 @@ export default { ...@@ -80,7 +80,6 @@ export default {
img { img {
height: 16px; height: 16px;
// margin-right:5.7px;
} }
.tab-content:nth-of-type(2) { .tab-content:nth-of-type(2) {
......
src/pages/intoApproval/intoApproval/refund.vue
View file @ e6169e0a
...@@ -283,21 +283,17 @@ export default { ...@@ -283,21 +283,17 @@ export default {
} }
.noData { .noData {
width: 100%; width: 100%;
// height:100%
} }
.header-top-bar { .header-top-bar {
width: 100%; width: 100%;
// display: flex;
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
text-align: center; text-align: center;
background-color: #fafafa; background-color: #fafafa;
// justify-content: space-around;
border-bottom: 1px solid #d9dbdf; border-bottom: 1px solid #d9dbdf;
position: fixed; position: fixed;
span { span {
display: inline-block; display: inline-block;
// float: left;
text-align: center; text-align: center;
font-family: PingFangSC-Semibold; font-family: PingFangSC-Semibold;
font-size: 14px; font-size: 14px;
......
src/pages/intoApproval/intoApproval/rentInfo.vue → src/pages/intoApproval/intoApproval/rent-info.vue
View file @ e6169e0a
...@@ -183,7 +183,6 @@ export default { ...@@ -183,7 +183,6 @@ export default {
.top-userInfo { .top-userInfo {
height: 44px; height: 44px;
width: 100%; width: 100%;
// background: rgba(0,70,156,0.03);
background: #F2F2F2; background: #F2F2F2;
span { span {
...@@ -208,7 +207,6 @@ export default { ...@@ -208,7 +207,6 @@ export default {
align-items: center; align-items: center;
color: #00469c; color: #00469c;
font-size: 15px; font-size: 15px;
//margin-left: 16px;
position: relative; position: relative;
margin-top: -10px; margin-top: -10px;
...@@ -223,22 +221,10 @@ export default { ...@@ -223,22 +221,10 @@ export default {
} }
} }
/*.userInfo::before {
content: "";
display: block;
width: 4px;
height: 20px;
background-color: #00469c;
position: absolute;
left: -15px;
top: 12px;
}*/
.alert { .alert {
height: 100px; height: 100px;
width: 100%; width: 100%;
margin-top: -10px; margin-top: -10px;
//margin-bottom: 20px;
background: #FbF2d2; background: #FbF2d2;
} }
......
src/pages/myInfo/my-info.vue
View file @ e6169e0a
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<img src="@/assets/myInfo/unFace.png" > <img src="@/assets/myInfo/unFace.png" >
<p>待面签</p> <p>待面签</p>
</div> </div>
<div> <div @click="goCarConfirm">
<img src="@/assets/myInfo/carConfirm.png" > <img src="@/assets/myInfo/carConfirm.png" >
<p>发车确认</p> <p>发车确认</p>
</div> </div>
...@@ -177,6 +177,12 @@ export default { ...@@ -177,6 +177,12 @@ export default {
name: 'StartList', name: 'StartList',
}) })
}, },
// 进入发车确认
goCarConfirm () {
this.$router.push({
name: 'ConfirmList',
})
},
changeHelp () { changeHelp () {
this.$router.push({ this.$router.push({
name: 'HelpList', name: 'HelpList',
......
src/pages/pay/firstPay/pay-entry.vue
View file @ e6169e0a
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<img v-show="select !== 'two'" src="@/assets/payment/unselect.png" alt=""> <img v-show="select !== 'two'" src="@/assets/payment/unselect.png" alt="">
</section> </section>
</item> </item>
<item v-for="(item,index) in lists" :proportion="[7,1,1]" :key="index" @click.native="isSelect(`three${index}`)"> <item v-for="(item,index) in newList" :proportion="[7,1,1]" :key="index" @click.native="isSelect(`three${index}`)">
<div slot="name" style="flex=3"> <img :src="selectImg(item)" alt="" class="icon"> {{ item.bank_full_name }}({{ selectLast(item) }})</div> <div slot="name" style="flex=3"> <img :src="selectImg(item)" alt="" class="icon"> {{ item.bank_full_name }}({{ selectLast(item) }})</div>
<section slot="content"> <section slot="content">
<img v-show="select === `three${index}`" src="@/assets/payment/select.png" alt=""> <img v-show="select === `three${index}`" src="@/assets/payment/select.png" alt="">
...@@ -68,12 +68,32 @@ export default { ...@@ -68,12 +68,32 @@ export default {
data () { data () {
return { return {
money: '', money: '',
select: 'one', select: 'three0',
name: '', name: '',
flag: false, // 用于判断是否有农业银行卡
lists: [], lists: [],
} }
}, },
computed: {}, computed: {
newList () {
let vm = this
let value
let flag
vm.lists.forEach((item, i) => {
if (item.bank_full_name.indexOf('农业') !== -1) {
value = vm.lists.splice(i, 1)
vm.lists.unshift(...value)
flag = true
}
})
if (flag) {
vm.select = 'three0'
} else {
vm.select = 'one'
}
return vm.lists
},
},
watch: {}, watch: {},
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
next(vm => { next(vm => {
...@@ -81,6 +101,7 @@ export default { ...@@ -81,6 +101,7 @@ export default {
vm.getType() vm.getType()
}) })
}, },
activated () { activated () {
this.money = this.$route.params.money this.money = this.$route.params.money
}, },
...@@ -142,6 +163,7 @@ export default { ...@@ -142,6 +163,7 @@ export default {
}, },
}) })
}, },
getType () { getType () {
let vm = this let vm = this
let url = process.env.basePath + 'payment_method_query' let url = process.env.basePath + 'payment_method_query'
...@@ -153,7 +175,6 @@ export default { ...@@ -153,7 +175,6 @@ export default {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
vm.lists = res.lists vm.lists = res.lists
vm.userName = res.lists[0].bank_account_name
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
......
src/pages/pay/payment/pay-entry.vue
View file @ e6169e0a
...@@ -27,21 +27,13 @@ ...@@ -27,21 +27,13 @@
<img v-show="select !== 'two'" src="@/assets/payment/unselect.png" alt=""> <img v-show="select !== 'two'" src="@/assets/payment/unselect.png" alt="">
</section> </section>
</item> </item>
<item v-for="(item,index) in lists" :proportion="[7,1,1]" :key="index" @click.native="isSelect(`three${index}`)"> <item v-for="(item,index) in newList" :proportion="[7,1,1]" :key="index" @click.native="isSelect(`three${index}`)">
<div slot="name" style="flex=3"> <img :src="selectImg(item)" alt="" class="icon"> {{ item.bank_full_name }}({{ selectLast(item) }})</div> <div slot="name" style="flex=3"> <img :src="selectImg(item)" alt="" class="icon"> {{ item.bank_full_name }}({{ selectLast(item) }})</div>
<section slot="content"> <section slot="content">
<img v-show="select === `three${index}`" src="@/assets/payment/select.png" alt=""> <img v-show="select === `three${index}`" src="@/assets/payment/select.png" alt="">
<img v-show="select !== `three${index}`" src="@/assets/payment/unselect.png" alt=""> <img v-show="select !== `three${index}`" src="@/assets/payment/unselect.png" alt="">
</section> </section>
</item> </item>
<!-- <item :proportion="[7,1,1]" @click.native="isSelect('four')">
<div slot="name"> <img src="@/assets/payment/js.png" alt="" class="icon"> 中国建设银行</div>
<section slot="content">
<img v-show="select === 'four'" src="@/assets/payment/select.png" alt="">
<img v-show="select !== 'four'" src="@/assets/payment/unselect.png" alt="">
</section>
</item> -->
</list-item> </list-item>
</h-content> </h-content>
...@@ -75,11 +67,31 @@ export default { ...@@ -75,11 +67,31 @@ export default {
data () { data () {
return { return {
money: '', money: '',
select: 'one', select: 'three0',
flag: false, // 用于判断是否有农业银行卡
lists: [], lists: [],
} }
}, },
computed: {}, computed: {
newList () {
let vm = this
let value
let flag
vm.lists.forEach((item, i) => {
if (item.bank_full_name.indexOf('农业') !== -1) {
value = vm.lists.splice(i, 1)
vm.lists.unshift(...value)
flag = true
}
})
if (flag) {
vm.select = 'three0'
} else {
vm.select = 'one'
}
return vm.lists
},
},
watch: { watch: {
}, },
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
......
src/pages/reimburseMyself/reimburse-detail.vue
View file @ e6169e0a
...@@ -45,14 +45,14 @@ ...@@ -45,14 +45,14 @@
<div slot="content">{{ '暂无字段' }}</div> <div slot="content">{{ '暂无字段' }}</div>
</item> </item>
</list-item> </list-item>
<div class="contract" v-for="(list,index) in conList" :key="index"> <div v-for="(list,index) in conList" class="contract" :key="index">
<div> <div>
<div class="top"> <div class="top">
<img src="@/assets/reimburseMyself/q.png" > <img src="@/assets/reimburseMyself/q.png" >
<span class="number">合同号</span> <span class="number">合同号</span>
<span>{{list.project_number}}</span> <span>{{ list.project_number }}</span>
</div> </div>
<div class="bottom" v-for="(item,indexTwo) in list.con_lists" :key="indexTwo"> <div v-for="(item,indexTwo) in list.con_lists" class="bottom" :key="indexTwo">
<list-item > <list-item >
<item> <item>
<div slot="name">首付款</div> <div slot="name">首付款</div>
...@@ -117,7 +117,7 @@ export default { ...@@ -117,7 +117,7 @@ export default {
} }
}) })
}, },
getConList() { getConList () {
let vm = this let vm = this
let url = process.env.basePath + 'my_con_list_query' let url = process.env.basePath + 'my_con_list_query'
let param = { let param = {
...@@ -184,7 +184,6 @@ export default { ...@@ -184,7 +184,6 @@ export default {
} }
.contract { .contract {
width: 359px; width: 359px;
// height: 194.5px;
background-color: #fff; background-color: #fff;
margin: 0 auto; margin: 0 auto;
margin-top: 8px; margin-top: 8px;
......
src/pages/userBind/userBind.vue
View file @ e6169e0a
...@@ -171,21 +171,5 @@ export default { ...@@ -171,21 +171,5 @@ export default {
} }
} }
} }
// iPhoneX适配
// @media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
// .platform-ios {
// #home{
// }
// }
// }
// iPhoneX Max适配
// @media (device-width: 414px) and (device-height: 896px) {
// .platform-ios {
// .platform-ios {
// #home{
// }
// }
// }
// }
</style> </style>
src/router/index.js
View file @ e6169e0a
...@@ -33,7 +33,7 @@ import NaturePerson from '@/pages/userBind/np/naturePerson' ...@@ -33,7 +33,7 @@ import NaturePerson from '@/pages/userBind/np/naturePerson'
import Enterprise from '@/pages/userBind/org/enterprise' import Enterprise from '@/pages/userBind/org/enterprise'
// 进件审批 // 进件审批
import Base from '@/pages/intoApproval/intoApproval/base' import Base from '@/pages/intoApproval/intoApproval/base'
import IntoList from '@/pages/intoApproval/intoList' import IntoList from '@/pages/intoApproval/into-list'
import Refund from '@/pages/intoApproval/intoApproval/refund' import Refund from '@/pages/intoApproval/intoApproval/refund'
// 经销商签约 // 经销商签约
import ContractList from '@/pages/distributorSign/contract-list' import ContractList from '@/pages/distributorSign/contract-list'
...@@ -63,10 +63,10 @@ import MarginPayEntry from '@/pages/pay/marginPay/pay-entry' ...@@ -63,10 +63,10 @@ import MarginPayEntry from '@/pages/pay/marginPay/pay-entry'
import QueryHome from '@/pages/productQuery/query-home' import QueryHome from '@/pages/productQuery/query-home'
import ProDetailed from '@/pages/productQuery/product-detailed' import ProDetailed from '@/pages/productQuery/product-detailed'
// 消息中心 // 消息中心
import InfoCenter from '@/pages/infoCenter/infoList' import InfoCenter from '@/pages/infoCenter/info-list'
import ProductList from '@/pages/productQuery/product-list' import ProductList from '@/pages/productQuery/product-list'
// 帮助与反馈 // 帮助与反馈
import HelpList from '@/pages/help/helpList' import HelpList from '@/pages/help/help-list'
import HelpDetail from '@/pages/help/detail' import HelpDetail from '@/pages/help/detail'
import HelpFeedback from '@/pages/help/feedback' import HelpFeedback from '@/pages/help/feedback'
...@@ -80,8 +80,12 @@ import RepayDetails from '@/pages/contractRepayment/repay-details' ...@@ -80,8 +80,12 @@ import RepayDetails from '@/pages/contractRepayment/repay-details'
import RepayPlan from '@/pages/contractRepayment/repay-plan' import RepayPlan from '@/pages/contractRepayment/repay-plan'
// 发车申请 // 发车申请
import StartList from '@/pages/contractStart/startList' import StartList from '@/pages/contractStart/start-list'
import AddCar from '@/pages/contractStart/addCar' import AddCar from '@/pages/contractStart/add-car'
// 发车确认
import ConfirmDetail from '@/pages/carConfirm/confirm-detail'
import ConfirmList from '@/pages/carConfirm/confirm-list'
Vue.use(Router) Vue.use(Router)
...@@ -164,7 +168,7 @@ export default new Router({ ...@@ -164,7 +168,7 @@ export default new Router({
// 进件审批 // 进件审批
{path: '/base', component: Base, name: 'Base', meta: {keepAlive: false}}, {path: '/base', component: Base, name: 'Base', meta: {keepAlive: false}},
{path: '/refund', component: Refund, name: 'Refund', meta: {keepAlive: false}}, {path: '/refund', component: Refund, name: 'Refund', meta: {keepAlive: false}},
{path: '/intoList', component: IntoList, name: 'IntoList', meta: {keepAlive: false}}, {path: '/into-list', component: IntoList, name: 'IntoList', meta: {keepAlive: false}},
// 经销商签约 // 经销商签约
{path: '/contract-list', component: ContractList, name: 'ContractList', meta: {keepAlive: false}}, {path: '/contract-list', component: ContractList, name: 'ContractList', meta: {keepAlive: false}},
{path: '/contract-details', component: ContractDetails, name: 'ContractDetails', meta: {keepAlive: false}}, {path: '/contract-details', component: ContractDetails, name: 'ContractDetails', meta: {keepAlive: false}},
...@@ -209,7 +213,9 @@ export default new Router({ ...@@ -209,7 +213,9 @@ export default new Router({
// 发车申请 // 发车申请
{path: '/start-List', component: StartList, name: 'StartList', meta: {keepAlive: true}}, {path: '/start-List', component: StartList, name: 'StartList', meta: {keepAlive: true}},
{path: '/add-car', component: AddCar, name: 'AddCar', meta: {keepAlive: true}}, {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: true}},
], ],
scrollBehavior (to, from, savedPosition) { scrollBehavior (to, from, savedPosition) {
if (to.hash) { if (to.hash) {
......
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