Commit 9b34924c authored by youjie's avatar youjie

营收报表、联运收入(网络、票务)

parent bdfc2f49
...@@ -941,6 +941,22 @@ export default { ...@@ -941,6 +941,22 @@ export default {
columnAlign: "left", columnAlign: "left",
isResize: true isResize: true
}, },
{
field: "TransportWL",
title: "网络",
width: 50,
titleAlign: "left",
columnAlign: "left",
isResize: true
},
{
field: "TransportPW",
title: "票务",
width: 50,
titleAlign: "left",
columnAlign: "left",
isResize: true
},
{ {
field: "TransportCost", field: "TransportCost",
formatter: this.moneyFormat, formatter: this.moneyFormat,
...@@ -977,7 +993,7 @@ export default { ...@@ -977,7 +993,7 @@ export default {
}, },
created() { created() {
this.msg.Is_Transport=this.$route.query.BranchId?Number(this.$route.query.BranchId):this.msg.OutBranchId; this.msg.Is_Transport=this.$route.query.BranchId?Number(this.$route.query.BranchId):this.msg.OutBranchId;
if(this.$route.query.startDate){ if(this.$route.query.startDate){
this.productionDate[0]=this.$route.query.startDate; this.productionDate[0]=this.$route.query.startDate;
this.productionDate[1]=this.$route.query.endDate; this.productionDate[1]=this.$route.query.endDate;
this.msg.startDate=this.$route.query.startDate; this.msg.startDate=this.$route.query.startDate;
...@@ -1380,7 +1396,7 @@ export default { ...@@ -1380,7 +1396,7 @@ export default {
} }
}, },
sortChange(param) { sortChange(param) {
if (param.YingShou === "asc") { if (param.YingShou === "asc") {
this.DataList.sort(this.compare("YingShou", 1)); this.DataList.sort(this.compare("YingShou", 1));
} else if (param.YingShou === "desc") { } else if (param.YingShou === "desc") {
...@@ -1420,7 +1436,7 @@ export default { ...@@ -1420,7 +1436,7 @@ export default {
this.BranchStatus=true; this.BranchStatus=true;
this.msg.Is_Transport=BranchStatus; this.msg.Is_Transport=BranchStatus;
} }
let data = res.data.data.pmodel.pageData; let data = res.data.data.pmodel.pageData;
this.total = res.data.data.pmodel.count; this.total = res.data.data.pmodel.count;
if (this.total == 0) { if (this.total == 0) {
......
...@@ -1911,6 +1911,22 @@ export default { ...@@ -1911,6 +1911,22 @@ export default {
columnAlign: "right", columnAlign: "right",
isResize: true isResize: true
}, },
{
field: "TransportWL",
title: "网络",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportPW",
title: "票务",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{ {
field: "TransportCost", field: "TransportCost",
formatter: this.moneyFormat, formatter: this.moneyFormat,
......
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