Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
罗超
SuperMan
Commits
06b61fec
Commit
06b61fec
authored
Jul 17, 2019
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
车辆统计页面还原
parent
a33b2aef
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
191 additions
and
164 deletions
+191
-164
busStatistics.vue
src/components/busManagement/busStatistics.vue
+191
-164
No files found.
src/components/busManagement/busStatistics.vue
View file @
06b61fec
...
...
@@ -47,157 +47,163 @@
:style=
"
{height: boxHeight + 'px'}">
<table
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
class=
"busStatisticsTalbe"
v-loading=
'loading'
>
<tr>
<th
width=
"
100"
>
序号
</th>
<th
width=
"
8
0"
>
出发地
</th>
<th
width=
"
8
0"
>
酒店
</th>
<th
width=
"1
1
0"
>
航班时间
</th>
<th
class=
"w
100"
>
序号
</th>
<th
width=
"
11
0"
>
出发地
</th>
<th
width=
"
11
0"
>
酒店
</th>
<th
width=
"1
5
0"
>
航班时间
</th>
<th
width=
"150"
>
公司团号
</th>
<th
width=
"
80"
>
线路
<br
/>
负责人
</th>
<th
width=
"
100"
>
线路
负责人
</th>
<th
width=
"70"
>
进出点
</th>
<th
width=
"
7
0"
>
机位总数
<br
/>
(Y/E/F)
</th>
<th
width=
"
8
0"
>
机位总数
<br
/>
(Y/E/F)
</th>
<th
width=
"80"
>
领队
</th>
<th
width=
"80"
>
导游
</th>
<th
width=
"80"
>
车型
</th>
<th
width=
"100"
>
时间
</th>
<th
width=
"80"
>
类型
</th>
<th
width=
"80"
>
状态
</th>
<th
width=
"80"
>
车辆状态
</th>
<th
width=
"80"
>
车费总计
</th>
<th
width=
"150"
>
车型
</th>
<th
width=
"100"
v-for=
'item in thLengthTitle'
>
{{
item
}}
</th>
<th
width=
"150"
>
车辆状态
</th>
<th
width=
"150"
>
车费总计
</th>
<th
width=
"80"
>
配车天数
</th>
<th
width=
"1
0
0"
>
操作
</th>
<th
width=
"1
2
0"
>
操作
</th>
</tr>
<template
v-for=
"(outItem,outindex) in DataList"
>
<tbody
:class=
"
{splitTrCss:outindex%2!=0}">
<template
v-for=
"(item,index) in outItem.StaticsReportList"
>
<template
v-for=
"(subItem,subIndex) in item.CommonReport.BusPlanListReport"
>
<template
v-for=
"(thirdItem,thirdIndex) in subItem.BusPlanOrderList"
>
<tr>
<td
:rowspan=
"outItem.rootRowspan"
v-if=
'index==0&&subIndex==0&&thirdIndex==0'
>
{{
outItem
.
NewCombinationNum
}}
</td>
<td
:rowspan=
"item.itemRowSpan"
v-if=
'subIndex==0&&thirdIndex==0'
>
{{
item
.
StartCityNames
}}
</td>
<td
:rowspan=
"item.itemRowSpan"
v-if=
'subIndex==0&&thirdIndex==0'
>
<el-popover
width=
"950"
trigger=
"click"
popper-class=
"Bus_HotelPop"
>
<commonHotelInfo
:HotelObj=
"item.CommonReport.PriceHotelResult"
:showHotelObj=
"showHotelObj"
>
</commonHotelInfo>
<div
slot=
"reference"
class=
"w80"
style=
"cursor:pointer;text-decoration:underline;"
>
酒店信息
</div>
</el-popover>
</td>
<td
:rowspan=
"item.itemRowSpan"
v-if=
'subIndex==0&&thirdIndex==0'
>
{{
item
.
FlightDate
}}
<br
/>
<el-popover
popper-class=
"busStatistics_tripDetails"
width=
"550"
trigger=
"click"
>
<table
width=
"100%"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<tr
class=
"_color_666"
style=
"text-align:center;"
>
<th
width=
"60"
>
{{
$t
(
'Airticket.Air_segment'
)
}}
</th>
<th
width=
"80"
>
{{
$t
(
'system.query_flightNum'
)
}}
</th>
<th
width=
"150"
>
起飞时间
</th>
<th
width=
"150"
>
到达时间
</th>
<th
width=
"100"
>
经停城市
</th>
</tr>
<tr
v-for=
"(ds,din) in item.FlightList"
:key=
"din"
style=
"text-align:center;"
>
<td
class=
"_d_name _color_666"
>
<span
v-if=
"din==0"
>
{{
$t
(
'Airticket.Air_go'
)
}}
</span>
<span
v-else-if=
"din==item.FlightList.length-1"
>
{{
$t
(
'Airticket.Air_returnTrip'
)
}}
</span>
<span
v-else-if=
"din>0 && din!=item.FlightList.length-1"
>
{{
$t
(
'Airticket.Air_transit'
)
}}
</span>
</td>
<td>
<div>
{{
ds
.
Flight_number
}}
</div>
<div
style=
"margin-top:5px;"
>
{{
ds
.
AlName
}}
</div>
</td>
<td>
<div>
{{
ds
.
FlightDate
}}
{{
ds
.
Departure_time
}}
</div>
<div
style=
"margin-top:5px;"
>
{{
ds
.
dName
}}
</div>
</td>
<td>
<div>
{{
ds
.
FlightArrivalTime
}}
{{
ds
.
Arrival_time
}}
</div>
<div
style=
"margin-top:5px;"
>
{{
ds
.
aName
}}
</div>
</td>
<td>
{{
ds
.
StopoverName
}}
</td>
</tr>
</table>
<el-button
slot=
"reference"
class=
"normalBtn mt5"
style=
'height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'
>
详情
</el-button>
</el-popover>
</td>
<td
:rowspan=
"item.itemRowSpan"
v-if=
'subIndex==0&&thirdIndex==0'
>
<p
@
click=
"goUrlT('productQuery',item.TCNUMS,'产品查询')"
style=
"cursor:pointer;text-decoration:underline;"
>
{{
item
.
TCNUMS
}}
(
{{
item
.
TCID
}}
)
</p>
</td>
<td
:rowspan=
"item.itemRowSpan"
v-if=
'subIndex==0&&thirdIndex==0'
>
{{
item
.
CreateByName
}}
</td>
<td
:rowspan=
"item.itemRowSpan"
v-if=
'subIndex==0&&thirdIndex==0'
>
{{
item
.
InOut
}}
</td>
<td
:rowspan=
"item.itemRowSpan"
v-if=
'subIndex==0&&thirdIndex==0'
>
<p
@
click=
"goUrlT('RegistrationList',item.TCIDS,'报名清单')"
style=
"cursor:pointer;text-decoration:underline;"
>
{{
item
.
TotalSeat
}}
/
{{
item
.
CommonReport
.
HouseStatistics
.
RealityYSeatNum
}}
/
{{
item
.
CommonReport
.
HouseStatistics
.
RealityESeatNum
}}
/
{{
item
.
CommonReport
.
HouseStatistics
.
RealityFSeatNum
}}
</p>
</td>
<td
:rowspan=
"item.itemRowSpan"
v-if=
'subIndex==0&&thirdIndex==0'
>
{{
item
.
LeaderName
}}
</td>
<td
:rowspan=
"item.itemRowSpan"
v-if=
'subIndex==0&&thirdIndex==0'
>
{{
item
.
GuideName
}}
</td>
<td
:rowspan=
"item.itemRowSpan"
v-if=
'subIndex==0&&thirdIndex==0'
>
<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
>
</td>
<td
:rowspan=
"subItem.BusPlanOrderList.length"
v-if=
'thirdIndex==0'
>
{{subItem.UseTimeStr}}
</td>
<td>
{{thirdItem.AirportPickUpStr}}
</td>
<td>
<span
style=
"color: #4BCA81;"
v-if=
"(thirdItem.AirportPickUpStr!='')"
>
√
</span>
<tbody
v-for=
"(outItem,outindex) in DataList"
:class=
"
{splitTrCss:outindex%2!=0}">
<template
v-for=
"(item,index) in outItem.StaticsReportList"
>
<tr>
<td
:rowspan=
"2*outItem.StaticsReportList.length"
v-if=
'index==0'
>
<div
class=
"w100"
>
{{
outItem
.
NewCombinationNum
}}
</div>
</td>
<td>
<div
class=
"w80"
>
{{
item
.
StartCityNames
}}
</div>
</td>
<td>
<el-popover
width=
"750"
trigger=
"click"
popper-class=
"Bus_HotelPop"
>
<commonHotelInfo
:HotelObj=
"item.CommonReport.PriceHotelResult"
:showHotelObj=
"showHotelObj"
>
</commonHotelInfo>
<div
slot=
"reference"
class=
"w80"
style=
"cursor:pointer;text-decoration:underline;"
>
酒店信息
</div>
</el-popover>
</td>
<td>
<div
class=
"w120"
>
{{
item
.
FlightDate
}}
<el-popover
popper-class=
"busStatistics_tripDetails"
width=
"550"
trigger=
"click"
>
<table
width=
"100%"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<tr
class=
"_color_666"
style=
"text-align:center;"
>
<th
width=
"60"
>
{{
$t
(
'Airticket.Air_segment'
)
}}
</th>
<th
width=
"80"
>
{{
$t
(
'system.query_flightNum'
)
}}
</th>
<th
width=
"150"
>
起飞时间
</th>
<th
width=
"150"
>
到达时间
</th>
<th
width=
"100"
>
经停城市
</th>
</tr>
<tr
v-for=
"(ds,din) in item.FlightList"
:key=
"din"
style=
"text-align:center;"
>
<td
class=
"_d_name _color_666"
>
<span
v-if=
"din==0"
>
{{
$t
(
'Airticket.Air_go'
)
}}
</span>
<span
v-else-if=
"din==item.FlightList.length-1"
>
{{
$t
(
'Airticket.Air_returnTrip'
)
}}
</span>
<span
v-else-if=
"din>0 && din!=item.FlightList.length-1"
>
{{
$t
(
'Airticket.Air_transit'
)
}}
</span>
</td>
<td>
<div>
{{
ds
.
Flight_number
}}
</div>
<div
style=
"margin-top:5px;"
>
{{
ds
.
AlName
}}
</div>
</td>
<td>
<div>
{{
ds
.
FlightDate
}}
{{
ds
.
Departure_time
}}
</div>
<div
style=
"margin-top:5px;"
>
{{
ds
.
dName
}}
</div>
</td>
<td>
<div>
{{
ds
.
FlightArrivalTime
}}
{{
ds
.
Arrival_time
}}
</div>
<div
style=
"margin-top:5px;"
>
{{
ds
.
aName
}}
</div>
</td>
<td>
{{
ds
.
StopoverName
}}
</td>
</tr>
</table>
<el-button
slot=
"reference"
class=
"normalBtn mt5"
style=
'height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'
>
详情
</el-button>
</el-popover>
</div>
</td>
<td>
<div
class=
"w120 link"
>
<p
@
click=
"goUrlT('productQuery',item.TCNUMS,'产品查询')"
>
{{
item
.
TCNUMS
}}
</p>
</div>
</td>
<td>
<div
class=
"w80"
>
{{
item
.
CreateByName
}}
</div>
</td>
<td>
<div
class=
"w80"
>
{{
item
.
InOut
}}
</div>
</td>
<td>
<div
class=
"w100 link"
>
<p
@
click=
"goUrlT('RegistrationList',item.TCIDS,'报名清单')"
>
{{
item
.
TotalSeat
}}
/
{{
item
.
CommonReport
.
HouseStatistics
.
RealityYSeatNum
}}
/
{{
item
.
CommonReport
.
HouseStatistics
.
RealityESeatNum
}}
/
{{
item
.
CommonReport
.
HouseStatistics
.
RealityFSeatNum
}}
</p>
</div>
</td>
<td>
<div
class=
"w80"
>
{{
item
.
LeaderName
}}
</div>
</td>
<td>
<div
class=
"w80"
>
{{
item
.
GuideName
}}
</div>
</td>
<td>
<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-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
:
""
)
}}
<span
style=
"color: #4BCA81;"
v-if=
"(childItem.AirportPickUpStr!='')"
>
√
</span>
<span
style=
"color: #E95252;"
v-else
>
X
</span>
</td>
<td
:rowspan=
"item.itemRowSpan"
v-if=
'subIndex==0&&thirdIndex==0'
>
<div
class=
"w80 fbold fz16"
>
<span
style=
"color: #E95252;"
v-if=
"item.CommonReport.BusOrderState==-1"
>
X
</span>
<span
style=
"color: #ff6600;"
v-else-if=
"item.CommonReport.BusOrderState==0"
>
O
</span>
<span
style=
"color: #4BCA81;"
v-else-if=
"item.CommonReport.BusOrderState==1"
>
√
</span>
</div>
</td>
<td
:rowspan=
"item.itemRowSpan"
v-if=
'subIndex==0&&thirdIndex==0'
>
{{GetTotalPrice(item.CommonReport.BusPlanListReport,item.CommonReport.HouseStatistics.RealityNum)}}
</td>
<td
:rowspan=
"item.itemRowSpan"
v-if=
'subIndex==0&&thirdIndex==0'
>
{{GetPeiChe(item.CommonReport.BusPlanListReport)}}
</td>
<td
:rowspan=
"item.itemRowSpan"
v-if=
'subIndex==0&&thirdIndex==0'
>
<span
@
click=
"goUrlX('BusInfo',item,outItem,'车配信息')"
style=
"cursor:pointer;text-decoration:underline;"
>
详情
</span>
<br
/>
<br
/>
<span
@
click=
"GoDownLoad(outItem)"
style=
"cursor:pointer;text-decoration:underline;"
>
手配书
</span>
</td>
</tr>
<tr
v-if=
"subIndex== item.CommonReport.BusPlanListReport.length-1 && thirdIndex==subItem.BusPlanOrderList.length-1"
>
<td
:colspan=
"17"
style=
"text-align: left!important;padding-left: 20px;"
>
<div
class=
"link"
>
<p
@
click=
"goUrlT('productQuery',item.TCNUMS,'产品查询')"
>
{{item.Titles}}
</p>
<div
v-show=
"item.DMCRemark!=''"
class=
"colorE95252"
>
地接备注:{{item.DMCRemark}}
</div>
<div
v-show=
"item.OPRemark!=''"
class=
"colorE95252"
>
OP备注(对外):{{item.OPRemark}}
</div>
<div
v-show=
"item.OPInnerRemark!=''"
class=
"colorE95252"
>
OP备注(对内):{{item.OPInnerRemark}}
</div>
</div>
</td>
</tr>
</template>
</template>
</template>
</tbody>
</template>
<template
v-if=
"x.BusPlanOrderList.length>1 && x.BusPlanOrderList.length-1!=childIndex"
>
<br
/>
</
template
>
</p>
</template>
</div>
</td>
<td
v-for=
"is in item.isCha"
></td>
<td>
<div
class=
"w80 fbold fz16"
>
<span
style=
"color: #E95252;"
v-if=
"item.CommonReport.BusOrderState==-1"
>
X
</span>
<span
style=
"color: #ff6600;"
v-else-if=
"item.CommonReport.BusOrderState==0"
>
O
</span>
<span
style=
"color: #4BCA81;"
v-else-if=
"item.CommonReport.BusOrderState==1"
>
√
</span></div>
</td>
<td>
<div
class=
"w150"
>
{{GetTotalPrice(item.CommonReport.BusPlanListReport,item.CommonReport.HouseStatistics.RealityNum)}}
</div>
</td>
<td>
<div
class=
"w100"
>
{{GetPeiChe(item.CommonReport.BusPlanListReport)}}
</div>
</td>
<td
:rowspan=
"2*outItem.StaticsReportList.length"
v-if=
'index==0'
>
<div
class=
"w100 link"
>
<span
@
click=
"goUrlX('BusInfo',item,outItem,'车配信息')"
>
详情
</span>
<span
@
click=
"GoDownLoad(outItem)"
>
手配书
</span>
</div>
</td>
</tr>
<tr>
<td
:colspan=
"colspanTotal"
style=
"text-align: left!important;padding-left: 20px;"
>
<div
class=
"link"
>
<p
@
click=
"goUrlT('productQuery',item.TCNUMS,'产品查询')"
>
{{item.Titles}}
</p>
<div
v-show=
"item.DMCRemark!=''"
class=
"colorE95252"
>
地接备注:{{item.DMCRemark}}
</div>
<div
v-show=
"item.OPRemark!=''"
class=
"colorE95252"
>
OP备注(对外):{{item.OPRemark}}
</div>
<div
v-show=
"item.OPInnerRemark!=''"
class=
"colorE95252"
>
OP备注(对内):{{item.OPInnerRemark}}
</div>
</div>
</td>
</tr>
</template>
</tbody>
</table>
</div>
<el-pagination
background
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"currentPage"
...
...
@@ -215,7 +221,7 @@
total
:
0
,
msg
:
{
pageIndex
:
1
,
pageSize
:
5
,
pageSize
:
10
,
SelectType
:
4
,
LineId
:
14
,
LineteamId
:
"-1"
,
...
...
@@ -401,23 +407,22 @@
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
total
=
res
.
data
.
data
.
count
;
var
sourceData
=
res
.
data
.
data
.
pageData
.
data
;
sourceData
.
forEach
(
outItem
=>
{
var
rootRowspan
=
0
;
//合团跨行
this
.
DataList
=
res
.
data
.
data
.
pageData
.
data
;
this
.
thLengthTitle
=
[];
this
.
colspanTotal
=
res
.
data
.
data
.
pageData
.
columnsCount
+
13
;
for
(
let
i
=
1
;
i
<=
res
.
data
.
data
.
pageData
.
columnsCount
;
i
++
)
{
this
.
thLengthTitle
.
push
(
'第'
+
i
+
'天'
);
}
this
.
DataList
.
forEach
(
outItem
=>
{
outItem
.
StaticsReportList
.
forEach
(
item
=>
{
var
itemRowSpan
=
0
;
//车辆跨行
item
.
CommonReport
.
BusPlanListReport
.
forEach
(
thirdItem
=>
{
thirdItem
.
BusPlanOrderList
.
forEach
(
lastItem
=>
{
rootRowspan
++
;
itemRowSpan
++
;
});
});
item
.
itemRowSpan
=
itemRowSpan
;
});
rootRowspan
+=
outItem
.
StaticsReportList
.
length
;
outItem
.
rootRowspan
=
rootRowspan
;
if
(
item
.
CommonReport
.
BusPlanListReport
.
length
<
res
.
data
.
data
.
pageData
.
data
.
length
)
{
item
.
isCha
=
res
.
data
.
data
.
pageData
.
columnsCount
-
item
.
CommonReport
.
BusPlanListReport
.
length
;
}
else
{
item
.
isCha
=
0
;;
}
})
})
this
.
DataList
=
sourceData
;
this
.
$forceUpdate
();
}
else
{
this
.
Error
(
res
.
data
.
message
);
...
...
@@ -434,6 +439,7 @@
"-"
+
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
;
...
...
@@ -455,7 +461,7 @@
}
.busStatisticsTalbe
{
b
order-collapse
:
collapse
;
b
ackground
:
#ccc
;
}
.busStatisticsTalbe
tr
th
{
...
...
@@ -468,13 +474,34 @@
.busStatisticsTalbe
tr
{
background
:
#fff
;
text-align
:
center
;
height
:
40px
;
}
.busStatisticsTalbe
tr
td
{
font-size
:
12px
;
height
:
20px
;
line-height
:
20px
;
border
:
1px
solid
#d2d2d2
;
}
.busStatisticsTalbe
tr
td
.pDateStyle
{
border-bottom
:
1px
solid
#ccc
;
min-height
:
24px
;
line-height
:
24px
;
margin-top
:
0
;
box-sizing
:
content-box
;
padding
:
0
10px
;
}
.busStatisticsTalbe
tr
td
.pDateStyle
:last-child
{
border-bottom
:
none
;
}
.busStatisticsTalbe
tr
td
.link
p
:hover
{
text-decoration
:
underline
;
cursor
:
pointer
;
}
.busStatisticsTalbe
tr
td
.link
span
:hover
{
text-decoration
:
underline
;
cursor
:
pointer
;
}
.busStatistics_tripDetails
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment