Commit 25a8916c authored by zhengke's avatar zhengke

no message

parent 442d33aa
...@@ -17,15 +17,29 @@ ...@@ -17,15 +17,29 @@
height: calc(100% - 83px); height: calc(100% - 83px);
} }
.orderDetails-body .order-info { .orderDetails-body .order-info {
height: 115px;
padding: 30px; padding: 30px;
box-sizing: border-box; box-sizing: border-box;
font-size: 12px; font-size: 12px;
background-color: #f6f4fc; background-color: #f6f4fc;
} }
.orderDetails-body .order-info .order-lable-box { .order-lable-box {
display: flex;
justify-content: space-between;
color: #999999; color: #999999;
} }
.order-lable-box:last-child{
margin-top: 20px;
}
.order-lable{
display: flex;
flex-direction: column;
}
.order-lable span:last-child{
font-size: 18px;
font-weight: bold;
color: #333;
margin-top: 5px;
}
</style> </style>
<template> <template>
<div class="orderDetails-box"> <div class="orderDetails-box">
...@@ -40,14 +54,14 @@ ...@@ -40,14 +54,14 @@
<div class="orderDetails-body"> <div class="orderDetails-body">
<div class="order-info"> <div class="order-info">
<div class="order-lable-box"> <div class="order-lable-box">
<div><span class="order-lable">关联销售:</span><span>5555</span></div> <div class="order-lable"><span>关联销售:</span><span>5555</span></div>
<div><span class="order-lable">订单号:</span><span >111</span></div> <div class="order-lable"><span>订单号:</span><span >111</span></div>
<div><span class="order-lable">客户姓名:</span><span>1</span></div> <div class="order-lable"><span>客户姓名:</span><span>1</span></div>
</div> </div>
<div> <div class="order-lable-box">
<div><span class="order-lable">性质:</span><span>1</span></div> <div class="order-lable"><span>性质:</span><span>1</span></div>
<div><span class="order-lable">形成概述:</span><span>111</span></div> <div class="order-lable"><span>形成概述:</span><span>111</span></div>
<div><span class="order-lable">状态:</span><span>1</span></div> <div class="order-lable"><span>状态:</span><span>1</span></div>
</div> </div>
</div> </div>
<div class="orderDetails-content"> <div class="orderDetails-content">
......
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
}, ], }, ],
clickMore: '', clickMore: '',
drawer: false, drawer: false,
orderDrawer: false, orderDrawer: true,
CustomerId: '', CustomerId: '',
CustomerName: '', CustomerName: '',
currentOrder:null currentOrder:null
......
...@@ -154,6 +154,7 @@ ...@@ -154,6 +154,7 @@
:data="dataList" :data="dataList"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
:height="dataList.length > 0 ? '600' : '660'"
row-class-name="font-size-12"> row-class-name="font-size-12">
<el-table-column <el-table-column
fixed fixed
...@@ -332,7 +333,7 @@ ...@@ -332,7 +333,7 @@
</el-table> </el-table>
</div> </div>
<div v-if="total>0"> <div v-if="total>0">
<el-pagination class="Mypagination" background @current-change="handleCurrentChange" :page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next" @size-change="handleSizeChange" :total="total"> <el-pagination class="Mypagination" background @current-change="handleCurrentChange" :page-sizes="[10, 30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next" @size-change="handleSizeChange" :total="total">
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
...@@ -383,7 +384,7 @@ ...@@ -383,7 +384,7 @@
loading: false, loading: false,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 30, pageSize: 10,
OrderId: "", OrderId: "",
GuestId: "", GuestId: "",
TicketStatus: '0', TicketStatus: '0',
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<div class="page-content finance-content"> <div class="page-content">
<el-table <el-table
v-loading="loading" v-loading="loading"
stripe stripe
...@@ -86,6 +86,7 @@ ...@@ -86,6 +86,7 @@
:data="dataList" :data="dataList"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
:height="dataList.length > 0 ? '600' : '660'"
row-class-name="font-size-12"> row-class-name="font-size-12">
<el-table-column <el-table-column
fixed fixed
...@@ -158,7 +159,7 @@ ...@@ -158,7 +159,7 @@
</div> </div>
<div v-if="total>0"> <div v-if="total>0">
<el-pagination class="Mypagination" background @current-change="handleCurrentChange" <el-pagination class="Mypagination" background @current-change="handleCurrentChange"
:page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next" :page-sizes="[10, 30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
@size-change="handleSizeChange" :total="total"> @size-change="handleSizeChange" :total="total">
</el-pagination> </el-pagination>
</div> </div>
...@@ -187,7 +188,7 @@ export default { ...@@ -187,7 +188,7 @@ export default {
loading: false, loading: false,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 30, pageSize: 10,
FrID:"0", FrID:"0",
Type:"-1", Type:"-1",
Status: "-1", Status: "-1",
......
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