Commit 86095ce4 authored by youjie's avatar youjie

车统计表

parent 2c8a2e6a
...@@ -1096,7 +1096,7 @@ ...@@ -1096,7 +1096,7 @@
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('tips.jiaoyifangshi')"> <el-table-column :label="$t('tips.jiaoyifangshi')" min-width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="_number"> <div class="_number">
<template v-if="scope.row.TradeWayList&&scope.row.TradeWayList.length>0"> <template v-if="scope.row.TradeWayList&&scope.row.TradeWayList.length>0">
......
...@@ -42,12 +42,13 @@ ...@@ -42,12 +42,13 @@
车辆状态&nbsp;&nbsp;&nbsp;确定:<span style="color:#4BCA81 ;"></span>暂定:<span style="color: #ff6600;">O</span>未操作:<span 车辆状态&nbsp;&nbsp;&nbsp;确定:<span style="color:#4BCA81 ;"></span>暂定:<span style="color: #ff6600;">O</span>未操作:<span
style="color:#E95252 ;">X</span> style="color:#E95252 ;">X</span>
</div> </div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle" <!-- <div style="width: 100%; overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle"
:style="{height: boxHeight + 'px'}"> :style="{height: boxHeight + 'px'}">
<OrderList :pagesTitle="Title" :OrderList="DataList" :loading="loading"
@success="msg.pageIndex=1,GetList()"> </div> -->
</OrderList> <OrderList v-if="DataList.length>0" :pagesTitle="Title" :OrderList="DataList" :loading="loading"
</div> :tableHeight="tableHeight" @success="msg.pageIndex=1,GetList()">
</OrderList>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination>
</div> </div>
...@@ -59,6 +60,7 @@ ...@@ -59,6 +60,7 @@
export default { export default {
data() { data() {
return { return {
tableHeight: 0,
loading: false, loading: false,
currentPage: 1, currentPage: 1,
total: 0, total: 0,
...@@ -84,6 +86,16 @@ ...@@ -84,6 +86,16 @@
OrderList OrderList
}, },
methods: { methods: {
com_onresize() {
//clientHeight的值由DIV内容的实际高度和CSS中的padding值决定,
var contentsHeight = document.body.clientHeight;
var h = contentsHeight - 50 - 180 - 100;
if (h < 110) {
return;
}
//设置table的行高
this.tableHeight = h;
},
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
...@@ -117,10 +129,10 @@ ...@@ -117,10 +129,10 @@
let x = this.DataList[i] let x = this.DataList[i]
// for(let j =0;i<x.CustomerList.length;j++){ // for(let j =0;i<x.CustomerList.length;j++){
// for(let j =0;i<x.OrderList.length;j++){ // for(let j =0;i<x.OrderList.length;j++){
// let UseDateStr = // let UseDateStr =
// } // }
// let UseDateStr = // let UseDateStr =
// } // }
} }
} else { } else {
...@@ -145,6 +157,10 @@ ...@@ -145,6 +157,10 @@
this.offsetwidth = width; this.offsetwidth = width;
this.getCustomerList(); this.getCustomerList();
this.getList(); this.getList();
this.com_onresize();
window.onresize = () => {
this.com_onresize();
}
}, },
} }
......
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