Commit 896328ad authored by 黄奎's avatar 黄奎

车辆统计Bug修改

parent 9eb5e3f2
......@@ -77,7 +77,8 @@
</td>
<td>
<el-popover width="750" trigger="click" popper-class="Bus_HotelPop">
<commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj"></commonHotelInfo>
<commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj">
</commonHotelInfo>
<div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;">酒店信息</div>
</el-popover>
</td>
......@@ -145,12 +146,15 @@
<div class="w80">{{item.GuideName}}</div>
</td>
<td>
<div class="w80">{{item.CommonReport.BusPlanListReport[0].BusPlanOrderList[0].MainBusTypeStr}} </div>
<div class="w80">
<template v-if="item.CommonReport&&item.CommonReport.BusPlanListReport&&item.CommonReport.BusPlanListReport.length>0&&item.CommonReport.BusPlanListReport[0].BusPlanOrderList&&item.CommonReport.BusPlanListReport[0].BusPlanOrderList[0]">
{{item.CommonReport.BusPlanListReport[0].BusPlanOrderList[0].MainBusTypeStr}}
</template>
</div>
</td>
<td v-for="(x,ww) in item.CommonReport.BusPlanListReport" style="vertical-align: top;">
<div class="w100">
<template v-for="(childItem,childIndex) in x.BusPlanOrderList">
<template v-if="x.BusPlanOrderList" v-for="(childItem,childIndex) in x.BusPlanOrderList">
<p class="pDateStyle" v-if="childIndex==0"> {{childItem.PlanDateStr}}</p>
<p class="pDateStyle">
{{(childItem.AirportPickUpStr!=""?childItem.AirportPickUpStr:"") }}
......@@ -232,10 +236,10 @@
colspanTotal: 0,
isCha: 0,
boxHeight: 0,
showHotelObj:{
showPrice:true,
showPay:true,
showZhan:true
showHotelObj: {
showPrice: true,
showPay: true,
showZhan: true
}
}
},
......@@ -255,11 +259,13 @@
GetTotalPrice(obj) { //车费总价
let totalPrice = 0;
obj.forEach(busInfo => {
if (busInfo.BusPlanOrderList) {
busInfo.BusPlanOrderList.forEach(subItem => {
if (subItem.CostPrice != undefined) {
totalPrice += subItem.CostPrice;
}
});
}
});
return totalPrice;
},
......@@ -286,6 +292,7 @@
let DayNum = 0;
obj.forEach((busInfo, index) => {
if (index == 0) {
if (busInfo.BusPlanOrderList) {
busInfo.BusPlanOrderList.forEach(subItem => {
if (subItem.AirportPickUpStr != "") {
jieji += subItem.AirportPickUpStr + ",";
......@@ -294,8 +301,9 @@
}
});
}
} else if (index == (obj.length - 1)) {
if (busInfo.BusPlanOrderList) {
busInfo.BusPlanOrderList.forEach(subItem => {
if (subItem.AirportPickUpStr != "") {
songji += subItem.AirportPickUpStr + ",";
......@@ -303,6 +311,8 @@
songji += "送机,";
}
});
}
} else {
DayNum += 1;
}
......@@ -397,7 +407,6 @@
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.DataList = res.data.data.pageData.data;
console.log("this.datalist",this.DataList);
this.thLengthTitle = [];
this.colspanTotal = res.data.data.pageData.columnsCount + 13;
for (let i = 1; i <= res.data.data.pageData.columnsCount; i++) {
......@@ -429,13 +438,11 @@
"-" +
myDate.getDate();
this.msg.StartDate = nowDate;
//this.msg.StartDate = '2019-08-12';
let width = window.innerWidth - 50;
let height = window.innerHeight - 65 - 210;
this.boxHeight = height;
this.offsetwidth = width;
// this.msg.CombinationNum = 'JVS0422OTC-NHA';
// this.msg.StartDate = "2019-04-20";
this.getList();
this.getLineTeamList();
},
......@@ -538,8 +545,10 @@
.busStatistics_tripDetails table tr._color_666 th {
padding: 9px 15px;
}
.Bus_HotelPop{
.Bus_HotelPop {
overflow: auto;
max-height: 350px;
}
</style>
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