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
559e1d58
Commit
559e1d58
authored
Jul 21, 2019
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改酒店统计
parent
0f15c92d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
102 additions
and
17 deletions
+102
-17
HotelOrderTotal.vue
src/components/TravelManager/TravelList/HotelOrderTotal.vue
+100
-15
index.vue
src/components/index.vue
+2
-2
No files found.
src/components/TravelManager/TravelList/HotelOrderTotal.vue
View file @
559e1d58
...
...
@@ -98,15 +98,45 @@
}
.groupTourOrder_count_gray
{
color
:
#
4D7AFD
;
color
:
#
999999
;
}
.HT_total
span
{
display
:
inline-block
;
margin
:
5px
10px
0
0
!important
;
}
.HT_totalFinacel
span
{
display
:
inline-block
;
margin
:
3px
5px
0
0
!important
;
}
.color_red_order
{
color
:
#e95252
!important
;
}
.groupTourOrderByTuan_ico
>
i
{
display
:
inline-block
;
margin
:
0
2px
0
0
;
width
:
8px
;
height
:
8px
;
border-radius
:
2px
;
vertical-align
:
middle
;
}
.groupTourOrder_tickets_red
{
color
:
#FF0000
;
text-decoration
:
underline
;
}
.groupTourOrder_tickets_blue
{
color
:
#0000FF
;
text-decoration
:
underline
;
}
.groupTourOrder_tickets_green
{
color
:
#008000
;
text-decoration
:
underline
;
}
.groupTourOrder_tickets_black
{
color
:
#000000
;
text-decoration
:
underline
;
}
</
style
>
...
...
@@ -171,28 +201,28 @@
<span>
<em>
入住开始时间
</em>
<el-date-picker
type=
"date"
v-model=
"msg.StartTime"
:picker-options=
"
pickerBeginDat
eBefore"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
:picker-options=
"
StartTim
eBefore"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
</span>
</li>
<li>
<span>
<em>
入住结束时间
</em>
<el-date-picker
type=
"date"
v-model=
"msg.EndTime"
:picker-options=
"
pickerBeginDat
eAfter"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
:picker-options=
"
EndTim
eAfter"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
</span>
</li>
<li>
<span>
<em>
创建开始时间
</em>
<el-date-picker
type=
"date"
v-model=
"msg.CStartTime"
:picker-options=
"
pickerBeginDat
eBefore"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
:picker-options=
"
CStartTim
eBefore"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
</span>
</li>
<li>
<span>
<em>
创建结束时间
</em>
<el-date-picker
type=
"date"
v-model=
"msg.CEndTime"
:picker-options=
"
pickerBeginDat
eAfter"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
:picker-options=
"
CEndTim
eAfter"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
</span>
</li>
...
...
@@ -204,7 +234,7 @@
<!-- 统计版块 -->
<div
class=
"groupTourOrder_count"
>
<el-row
:gutter=
"20"
>
<el-col
:span=
"
6
"
class=
"groupTourOrder_count_col"
>
<el-col
:span=
"
5
"
class=
"groupTourOrder_count_col"
>
<div
class=
"groupTourOrder_count_item HT_total"
>
<div>
<i
class=
"iconfont icon-qian groupTourOrder_count_green"
></i>
...
...
@@ -217,20 +247,45 @@
</p>
</div>
</el-col>
<el-col
:span=
"
6
"
class=
"groupTourOrder_count_col"
>
<el-col
:span=
"
5
"
class=
"groupTourOrder_count_col"
>
<div
class=
"groupTourOrder_count_item HT_total"
>
<div>
<i
class=
"iconfont icon-tongji1 groupTourOrder_count_
gray
"
></i>
<i
class=
"iconfont icon-tongji1 groupTourOrder_count_
blue
"
></i>
<span>
数量
</span>
</div>
<p>
<span
class=
"groupTourOrder_count_green"
>
总房间数:
{{
TotalMsg
.
totalRoomNum
}}
</span>
<span
class=
"color_red_order"
>
取消房间数:
{{
TotalMsg
.
totalCancelRoomNum
}}
</span>
<span>
erp数:
{{
TotalMsg
.
totalERP
}}
</span>
<span>
B2b数:
{{
TotalMsg
.
totalB2B
}}
</span>
</p>
</div>
</el-col>
<el-col
:span=
"5"
class=
"groupTourOrder_count_col"
>
<div
class=
"groupTourOrder_count_item HT_total"
>
<div>
<i
class=
"iconfont icon-tongji1 groupTourOrder_count_gray"
></i>
<span>
其他统计项
</span>
</div>
<p>
<span
class=
"groupTourOrder_count_green"
>
内部报名:
{{
TotalMsg
.
totalERP
}}
</span>
<span
class=
"color_red_order"
>
B2B/WAP网络报名:
{{
TotalMsg
.
totalB2B
}}
</span>
</p>
</div>
</el-col>
<el-col
:span=
"5"
class=
"groupTourOrder_count_col"
>
<div
class=
"groupTourOrder_count_item HT_totalFinacel"
>
<div>
<i
class=
"iconfont icon-tongji1 groupTourOrder_count_gray"
></i>
<span>
财务单据说明
</span>
</div>
<p>
<span
class=
"groupTourOrderByTuan_ico"
><i
style=
"background-color:#0000ff"
></i><span>
已打单
</span></span>
<span
class=
"groupTourOrderByTuan_ico"
><i
style=
"background-color:#00FF00"
></i><span>
平台出纳已审核
</span></span>
<span
class=
"groupTourOrderByTuan_ico"
><i
style=
"background-color:#FF0000"
></i><span>
银行出纳已审核
</span></span>
<span
class=
"groupTourOrderByTuan_ico"
><i
style=
"background-color:#000000"
></i><span>
已通过
</span></span>
</p>
</div>
</el-col>
</el-row>
</div>
...
...
@@ -266,7 +321,9 @@
<td>
{{
item
.
DiscountMoney
}}
</td>
<td>
{{
item
.
DueinMoney
}}
</td>
<td>
{{
item
.
OrderStatus
}}
</td>
<td>
<span
:class=
"item.OrderStatus=='已取消'?'color_red_order':''"
>
{{
item
.
OrderStatus
}}
</span>
</td>
<td>
{{
item
.
CreateDateStr
}}
</td>
<td>
{{
item
.
CheckInStr
}}
</td>
<td>
{{
item
.
CheckOutStr
}}
</td>
...
...
@@ -292,7 +349,10 @@
<div>
收款单据:
</div>
<div>
<span
v-for=
"subItem in item.FinanceList"
>
{{
item
}}
<span
v-if=
"subItem.colorState===1"
class=
"groupTourOrder_tickets_blue"
>
{{
subItem
.
frID
}}
</span>
<span
v-else-if=
"subItem.colorState===2"
class=
"groupTourOrder_tickets_green"
>
{{
subItem
.
frID
}}
</span>
<span
v-else-if=
"subItem.colorState===3"
class=
"groupTourOrder_tickets_red"
>
{{
subItem
.
frID
}}
</span>
<span
v-else-if=
"subItem.colorState===4"
class=
"groupTourOrder_tickets_black"
>
{{
subItem
.
frID
}}
</span>
</span>
<span
v-if=
"item.FinanceList==0"
>
暂无数据
</span>
</div>
...
...
@@ -301,7 +361,10 @@
<div>
付款单据:
</div>
<div>
<span
v-for=
"subItem in item.RefundFinanceList"
>
{{
item
}}
<span
v-if=
"subItem.colorState===1"
class=
"groupTourOrder_tickets_blue"
>
{{
subItem
.
frID
}}
</span>
<span
v-else-if=
"subItem.colorState===2"
class=
"groupTourOrder_tickets_green"
>
{{
subItem
.
frID
}}
</span>
<span
v-else-if=
"subItem.colorState===3"
class=
"groupTourOrder_tickets_red"
>
{{
subItem
.
frID
}}
</span>
<span
v-else-if=
"subItem.colorState===4"
class=
"groupTourOrder_tickets_black"
>
{{
subItem
.
frID
}}
</span>
</span>
<span
v-if=
"item.RefundFinanceList==0"
>
暂无数据
</span>
</div>
...
...
@@ -311,6 +374,11 @@
</tr>
</tbody>
</table>
<div
class=
"noDataNotice"
v-if=
"dataList.length
<1
"
>
<i
class=
"iconfont icon-kong"
></i>
<p>
{{
$t
(
"active.ld_noData"
)
}}
</p>
</div>
<el-pagination
background
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"currentPage"
layout=
"total,prev, pager, next, jumper"
:page-size=
msg.pageSize
:total=
total
>
</el-pagination>
...
...
@@ -336,7 +404,7 @@ export default {
total
:
0
,
currentPage
:
1
,
loading
:
false
,
pickerBeginDat
eBefore
:
{
StartTim
eBefore
:
{
disabledDate
:
time
=>
{
if
(
this
.
msg
.
EndTime
==
null
)
{
return
false
;
...
...
@@ -346,12 +414,29 @@ export default {
}
}
},
pickerBeginDat
eAfter
:
{
EndTim
eAfter
:
{
disabledDate
:
time
=>
{
let
startTime
=
new
Date
(
this
.
msg
.
StartTime
)
return
startTime
.
getTime
()
>=
time
.
getTime
()
}
},
CStartTimeBefore
:
{
disabledDate
:
time
=>
{
if
(
this
.
msg
.
CEndTime
==
null
)
{
return
false
;
}
else
{
let
endTime
=
new
Date
(
this
.
msg
.
CEndTime
)
return
endTime
.
getTime
()
<
time
.
getTime
()
}
}
},
CEndTimeAfter
:
{
disabledDate
:
time
=>
{
let
startTime
=
new
Date
(
this
.
msg
.
CStartTime
)
return
startTime
.
getTime
()
>=
time
.
getTime
()
}
},
orderStatus
:[{
Name
:
'全部'
,
Id
:
0
...
...
src/components/index.vue
View file @
559e1d58
...
...
@@ -899,7 +899,7 @@
</div>
<div
style=
"text-align:center"
>
<p
style=
"font-size:26px;color:#111111;margin:40px 0"
>
第{{tsNumber}}期投诉案例分享已经发布
</p>
<a
@
click=
"CloseTs"
target=
"_blank"
href=
"http://we.oytour.com:8110/?/article/
8
"
style=
"font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline"
>
点击查看
</a>
<a
@
click=
"CloseTs"
target=
"_blank"
href=
"http://we.oytour.com:8110/?/article/
10
"
style=
"font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline"
>
点击查看
</a>
</div>
</div>
</div>
...
...
@@ -930,7 +930,7 @@ export default {
data
()
{
return
{
tsState
:
false
,
tsNumber
:
1
,
tsNumber
:
2
,
saleRnkShow
:
false
,
dialogTitleNot
:
''
,
outerVisibleNot
:
false
,
...
...
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