Commit 054bd5ad authored by youjie's avatar youjie

no message

parent 673af2e2
<style> <style scoped>
@import "../../../assets/css/customerManage.css"; @import "../../../assets/css/customerManage.css";
* { * {
font-family: "perfectFont"; font-family: "perfectFont";
...@@ -11,32 +11,35 @@ ...@@ -11,32 +11,35 @@
.query-box .el-row .el-col span { .query-box .el-row .el-col span {
flex-shrink: 0; flex-shrink: 0;
} }
.statistics { .orderAllList {
background: #fff; display: flex;
flex-wrap: wrap;
/* padding: 0 10px; */
background-color: #ffffff;
} }
.statistics-box { .orderAllList-box {
padding: 7px 16px; flex: 0 0 25%;
background-color: #dddee0; background-color: #dddee0;
display: flex; display: flex;
flex-shrink: 0;
margin: 0 5px;
padding: 10px;
flex-direction: column; flex-direction: column;
flex-wrap: wrap;
border-radius: 5px; border-radius: 5px;
margin-right: 10px;
} }
.statistics-top{ .orderAllList-top{
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
} }
.statistics-box span{ .orderAllList-top div{
margin-right: 10px; display: flex;
} flex-direction: row;
.statistics-box:last-child { align-items: center;
margin-right: 0; flex-wrap: wrap;
padding-right: 20px;
} }
.statistics-box span:first-child { .orderAllList-top span{
font-weight: bold; font-size: 14px;
margin-right: 5px;
flex-shrink: 0;
} }
.red { .red {
color: #f72e52; color: #f72e52;
...@@ -191,14 +194,14 @@ ...@@ -191,14 +194,14 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<div class="statistics px-10px"> <div class="orderAllList">
<template v-for="(item,index) in SummaryList"> <template v-for="(item,index) in SummaryList">
<div class="statistics-box" :key="index"> <div class="orderAllList-box" :key="index">
<!-- <span>币种</span> --> <div class="orderAllList-title">
<div> <!-- <span>币种</span> -->
<span>{{item.CurrencyName}}</span> <span>{{item.CurrencyName}}</span>
</div> </div>
<div class="statistics-top"> <div class="orderAllList-top">
<div> <div>
<span>应收</span> <span>应收</span>
<span>{{item.Money}}</span> <span>{{item.Money}}</span>
...@@ -209,7 +212,7 @@ ...@@ -209,7 +212,7 @@
</div> </div>
<div> <div>
<span>退款</span> <span>退款</span>
<span class="red">{{item.Refund}}</span> <span>{{item.Refund}}</span>
</div> </div>
<div> <div>
<span>手续费</span> <span>手续费</span>
......
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
:data="dataList" :data="dataList"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
row-class-name="font-size-12"> row-class-name="font-size-12"
:default-sort = "{prop: 'date', order: 'descending'}">
<el-table-column <el-table-column
label="商品类型" label="商品类型"
show-overflow-tooltip> show-overflow-tooltip>
...@@ -19,9 +20,27 @@ ...@@ -19,9 +20,27 @@
<el-table-column <el-table-column
width="130" width="130"
prop="CreateTimeStr" prop="CreateTimeStr"
label="日期" label="下单日期"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column
width="130"
prop="StartDate"
label="出发日期"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="OrderId"
label="订单ID"
show-overflow-tooltip>
</el-table-column>
<el-table-column
label="团号/单号"
show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.TCNUM}}
</template>
</el-table-column>
<el-table-column <el-table-column
label="客人姓名" label="客人姓名"
show-overflow-tooltip> show-overflow-tooltip>
...@@ -52,16 +71,19 @@ ...@@ -52,16 +71,19 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
sortable
prop="Money" prop="Money"
label="总金额" label="总金额"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
sortable
prop="CostMoney" prop="CostMoney"
label="成本" label="成本"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
sortable
label="待收" label="待收"
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -69,21 +91,25 @@ ...@@ -69,21 +91,25 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
sortable
prop="Income" prop="Income"
label="实收" label="实收"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
sortable
prop="PlatformTax" prop="PlatformTax"
label="手续费" label="手续费"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
sortable
prop="Refund" prop="Refund"
label="退款" label="退款"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
sortable
prop="DiscountsMoney" prop="DiscountsMoney"
label="优惠" label="优惠"
show-overflow-tooltip> show-overflow-tooltip>
......
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