Commit 54747699 authored by youjie's avatar youjie

no message

parent 5704174c
...@@ -231,13 +231,14 @@ ...@@ -231,13 +231,14 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data.pageData let data = res.data.data.pageData
// let addList = function(arr){ let addList = function(arr){
// arr.forEach(x=>{ arr.forEach(x=>{
// x.Tax = 0 x.list = []
// x.Tax2 = 0 // x.Tax = 0
// }) // x.Tax2 = 0
// } })
// addList(data) }
addList(data)
data.forEach(item => { data.forEach(item => {
item.DetailList.forEach(x=>{ item.DetailList.forEach(x=>{
x.Number = 0 x.Number = 0
...@@ -251,7 +252,19 @@ ...@@ -251,7 +252,19 @@
x.Money = x.HotelMoeny+x.TaxesPrice x.Money = x.HotelMoeny+x.TaxesPrice
}) })
}) })
this.OrderList = data; this.OrderList = data;
this.OrderList.forEach(item=>{
let datas = {
Income: item.Income,
CostMoney: item.CostMoney,
PlatformTax: item.PlatformTax,
Refund: item.Refund,
HandFittingIncome: item.HandFittingIncome,
HandFittingTax: item.HandFittingTax
}
item.list.push(datas)
})
this.total = res.data.data.count; this.total = res.data.data.count;
}else { }else {
this.Error(res.data.message); this.Error(res.data.message);
......
...@@ -141,7 +141,6 @@ ...@@ -141,7 +141,6 @@
<span class="ml">小计:{{x.Money}}</span> <span class="ml">小计:{{x.Money}}</span>
</div> </div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="订单号" min-width="100"> <el-table-column label="订单号" min-width="100">
...@@ -152,36 +151,6 @@ ...@@ -152,36 +151,6 @@
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="实收" min-width="100">
<template slot-scope="scope">
<span>{{item.Income?item.Income:'-'}}</span>
</template>
</el-table-column>
<el-table-column label="成本" min-width="100">
<template slot-scope="scope">
<span>{{item.CostMoney?item.CostMoney:'-'}}</span>
</template>
</el-table-column>
<el-table-column label="平台税金" min-width="100">
<template slot-scope="scope">
<span>{{item.PlatformTax?item.PlatformTax:'-'}}</span>
</template>
</el-table-column>
<el-table-column label="退款" min-width="100">
<template slot-scope="scope">
<span>{{item.Refund?item.Refund:'-'}}</span>
</template>
</el-table-column>
<el-table-column label="手配费实收" min-width="100">
<template slot-scope="scope">
<span>{{item.HandFittingIncome?item.HandFittingIncome:'-'}}</span>
</template>
</el-table-column>
<el-table-column label="手配费平台税金" min-width="100">
<template slot-scope="scope">
<span>{{item.HandFittingTax?item.HandFittingTax:'-'}}</span>
</template>
</el-table-column>
<el-table-column label="城市税" min-width="60"> <el-table-column label="城市税" min-width="60">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.Tax>0?scope.row.Tax.toFixed(2):'-'}} {{scope.row.Tax>0?scope.row.Tax.toFixed(2):'-'}}
...@@ -204,6 +173,38 @@ ...@@ -204,6 +173,38 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<el-table :data="item.list" style="width:100%" border>
<el-table-column label="实收" min-width="100">
<template slot-scope="scope">
<span>{{scope.row.Income?scope.row.Income:'-'}}</span>
</template>
</el-table-column>
<el-table-column label="成本" min-width="100">
<template slot-scope="scope">
<span>{{scope.row.CostMoney?scope.row.CostMoney:'-'}}</span>
</template>
</el-table-column>
<el-table-column label="平台税金" min-width="100">
<template slot-scope="scope">
<span>{{scope.row.PlatformTax?scope.row.PlatformTax:'-'}}</span>
</template>
</el-table-column>
<el-table-column label="退款" min-width="100">
<template slot-scope="scope">
<span>{{scope.row.Refund?scope.row.Refund:'-'}}</span>
</template>
</el-table-column>
<el-table-column label="手配费实收" min-width="100">
<template slot-scope="scope">
<span>{{scope.row.HandFittingIncome?scope.row.HandFittingIncome:'-'}}</span>
</template>
</el-table-column>
<el-table-column label="手配费平台税金" min-width="100">
<template slot-scope="scope">
<span>{{scope.row.HandFittingTax?scope.row.HandFittingTax:'-'}}</span>
</template>
</el-table-column>
</el-table>
<div class="row justify-sb mt mb20"> <div class="row justify-sb mt mb20">
<!-- <div class="row pt20"> <!-- <div class="row pt20">
<i class="el-icon-warning cF57A98 fz15 mr"></i> <i class="el-icon-warning cF57A98 fz15 mr"></i>
......
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