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
a28e0d25
Commit
a28e0d25
authored
Jul 16, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
68a9cf6e
8b9a671c
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
1447 additions
and
132 deletions
+1447
-132
roomReservationsDetails.vue
src/components/Hotel/roomReservationsDetails.vue
+2
-2
leaderReimbursement.vue
src/components/LeaderManagement/leaderReimbursement.vue
+6
-2
Login.vue
src/components/Login.vue
+11
-8
enrollTotal.vue
src/components/SalesModule/enrollTotal.vue
+10
-2
groupTourOrder.vue
src/components/SalesModule/groupTourOrder.vue
+10
-0
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+10
-0
salesHotelOrder.vue
src/components/SalesModule/salesHotelOrder.vue
+217
-0
OpHotelOrder.vue
src/components/TravelManager/TravelList/OpHotelOrder.vue
+217
-0
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+11
-3
todayOrderTotal.vue
src/components/TravelManager/TravelList/todayOrderTotal.vue
+13
-0
index.vue
src/components/personalCenter/index.vue
+2
-1
admissionStatisticsDetails.vue
src/components/scenicSpot/admissionStatisticsDetails.vue
+1
-0
scenicSpotInfoManage.vue
src/components/scenicSpot/scenicSpotInfoManage.vue
+4
-1
dailyAnalysis.vue
src/components/visualization/dailyAnalysis.vue
+560
-110
nianduduibi.vue
src/components/visualization/nianduduibi.vue
+155
-0
nianduzoushi.vue
src/components/visualization/nianduzoushi.vue
+201
-0
pingtai.vue
src/components/visualization/pingtai.vue
+0
-1
progress.vue
src/components/visualization/progress.vue
+1
-1
config.js
src/router/config.js
+16
-1
No files found.
src/components/Hotel/roomReservationsDetails.vue
View file @
a28e0d25
...
...
@@ -717,8 +717,8 @@
let
totalPrice
=
0
;
obj
.
OrderDetailsList
.
forEach
((
item
,
index
)
=>
{
var
tempPrice
=
0
;
//税别
if
(
obj
.
TaxType
==
2
&&
item
.
RebateRatio
>
0
)
{
//税别
&& item.RebateRatio>0
if
(
obj
.
TaxType
==
2
)
{
tempPrice
=
item
.
UnitPrice
*
(
item
.
BookNum
-
item
.
HotelDiscount
)
*
(
1
+
0.08
-
item
.
RebateRatio
/
100
);
}
else
{
tempPrice
=
item
.
UnitPrice
*
(
item
.
BookNum
-
item
.
HotelDiscount
)
*
(
1
-
item
.
RebateRatio
/
100
);
...
...
src/components/LeaderManagement/leaderReimbursement.vue
View file @
a28e0d25
...
...
@@ -318,6 +318,7 @@
<th
width=
"100"
>
使用时间
</th>
<th
width=
"180"
>
餐厅名称
</th>
<th
width=
"100"
>
类别
</th>
<th
width=
"100"
>
总人数
</th>
<th
width=
""
>
用餐人数
</th>
<th
width=
"80"
>
免费人数
</th>
<th
width=
""
>
单价
</th>
...
...
@@ -337,6 +338,9 @@
<td
v-if=
"childIndex==0"
:rowspan=
"3"
>
{{
subItem
.
UseDinnerTypeStr
}}
</td>
<td
v-if=
"childIndex==0"
:rowspan=
"3"
>
{{
subItem
.
UseAccount
}}
</td>
<td>
{{
peopleStrToWord
(
childItem
.
PeopleType
)
}}
:
{{
childItem
.
PeopleNum
}}
</td>
...
...
@@ -730,8 +734,8 @@
let
totalPrice
=
0
;
obj
.
OrderDetailsList
.
forEach
((
item
,
index
)
=>
{
if
(
obj
.
PayStyle
===
1
)
{
//税别
if
(
obj
.
TaxType
==
2
&&
item
.
RebateRatio
>
0
)
{
//税别
&& item.RebateRatio>0
if
(
obj
.
TaxType
==
2
)
{
totalPrice
+=
item
.
UnitPrice
*
(
item
.
BookNum
-
item
.
HotelDiscount
)
*
(
1
+
0.08
-
item
.
RebateRatio
/
100
);
//税入
}
else
{
...
...
src/components/Login.vue
View file @
a28e0d25
...
...
@@ -304,14 +304,17 @@ export default {
this
.
$cookie
.
set
(
"RB_Group_id"
,
userData
.
RB_Group_id
);
localStorage
.
menu
=
JSON
.
stringify
(
firstTire
)
this
.
loginState
=
0
;
let
previousPathInfo
=
localStorage
.
previousPathInfo
?
JSON
.
parse
(
localStorage
.
previousPathInfo
)
:
''
if
(
previousPathInfo
)
{
let
path
=
previousPathInfo
.
path
.
indexOf
(
'login'
)
===
-
1
?
previousPathInfo
.
path
:
'index'
let
query
=
previousPathInfo
.
query
?
previousPathInfo
.
query
:
{}
this
.
$router
.
push
({
path
:
"/"
+
path
,
query
:
query
});
}
else
{
this
.
$router
.
push
({
path
:
"/index"
});
}
// let previousPathInfo = localStorage.previousPathInfo ? JSON.parse(localStorage.previousPathInfo) : ''
// if (previousPathInfo) {
// let path = previousPathInfo.path.indexOf('login') === -1 ? previousPathInfo.path : 'index'
// let query = previousPathInfo.query ? previousPathInfo.query : {}
// this.$router.push({ path: "/"+ path, query: query });
// }else {
// this.$router.push({ path: "/index" });
// }
this
.
$router
.
push
({
path
:
"/personalCenter"
});
//登录成功后跳转页面
// this.$notify.success({
// title:'提示',
...
...
src/components/SalesModule/enrollTotal.vue
View file @
a28e0d25
...
...
@@ -209,8 +209,16 @@
<p
v-if=
"item.tradeWay ==1"
>
{{
item
.
platformOrder
}}
</p>
<p
v-if=
'item.commissionMoney'
style=
"color:red"
>
提成:
{{
item
.
commissionMoney
}}
</p>
<p
v-else-if=
"item.latestCommissionMoney"
style=
"color:red"
>
提成:
{{
item
.
latestCommissionMoney
}}
</p>
<div
v-if=
"item.extraRewardMoney!=null&&item.extraRewardMoney>0"
>
奖励金额:
<span
style=
"color:#e95252"
>
{{
item
.
extraRewardMoney
}}
</span></div>
<div
v-if=
"item.extraDeductMoney!=null&&item.extraDeductMoney>0"
>
扣除金额:
<span
style=
"color:#e95252"
>
{{
item
.
extraDeductMoney
}}
</span></div>
<div>
<div
style=
"color:green"
v-if=
"item.commissionMoney==''||item.commissionMoney=='-1'"
>
<p
v-if=
"item.extraRewardMoney>0"
>
额外奖励金额:
{{
item
.
extraRewardMoney
}}
</p>
<p
v-if=
"item.extraDeductMoney>0"
>
额外扣除金额:
{{
item
.
extraDeductMoney
}}
</p>
</div>
<div
style=
"color:red"
v-else
>
<p
v-if=
"item.extraRewardMoney>0"
>
额外奖励金额:
{{
item
.
extraRewardMoney
}}
</p>
<p
v-if=
"item.extraDeductMoney>0"
>
额外扣除金额:
{{
item
.
extraDeductMoney
}}
</p>
</div>
</div>
</td>
<td>
<p
class=
"over_ellipsis"
style=
"width: 150px;"
:title=
"item.contactName"
>
{{
item
.
contactName
}}
</p>
...
...
src/components/SalesModule/groupTourOrder.vue
View file @
a28e0d25
...
...
@@ -1532,6 +1532,16 @@
<p
v-if=
"item.tradeWay ==1"
>
{{
item
.
platformOrder
}}
</p>
<p
v-if=
'item.commissionMoney'
style=
"color:red"
>
提成:
{{
item
.
commissionMoney
}}
</p>
<p
v-else-if=
"item.latestCommissionMoney"
style=
"color:red"
>
提成:
{{
item
.
latestCommissionMoney
}}
</p>
<div>
<div
style=
"color:green"
v-if=
"item.commissionMoney==''||item.commissionMoney=='-1'"
>
<p
v-if=
"item.extraRewardMoney>0"
>
额外奖励金额:
{{
item
.
extraRewardMoney
}}
</p>
<p
v-if=
"item.extraDeductMoney>0"
>
额外扣除金额:
{{
item
.
extraDeductMoney
}}
</p>
</div>
<div
style=
"color:red"
v-else
>
<p
v-if=
"item.extraRewardMoney>0"
>
额外奖励金额:
{{
item
.
extraRewardMoney
}}
</p>
<p
v-if=
"item.extraDeductMoney>0"
>
额外扣除金额:
{{
item
.
extraDeductMoney
}}
</p>
</div>
</div>
</td>
<td>
<p
class=
"fz12 over_ellipsis"
style=
"width: 120px;"
:title=
"item.contactName"
>
{{
item
.
contactName
}}
</p>
...
...
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
a28e0d25
...
...
@@ -1671,6 +1671,16 @@
<p
v-if=
'item.commissionMoney'
style=
"color:red"
>
提成:
{{
item
.
commissionMoney
}}
</p>
<p
v-else-if=
"item.latestCommissionMoney"
style=
"color:red"
>
提成:
{{
item
.
latestCommissionMoney
}}
</p>
</
template
>
<div>
<div
style=
"color:green"
v-if=
"item.commissionMoney==''||item.commissionMoney=='-1'"
>
<p
v-if=
"item.extraRewardMoney>0"
>
额外奖励金额:{{item.extraRewardMoney}}
</p>
<p
v-if=
"item.extraDeductMoney>0"
>
额外扣除金额:{{item.extraDeductMoney}}
</p>
</div>
<div
style=
"color:red"
v-else
>
<p
v-if=
"item.extraRewardMoney>0"
>
额外奖励金额:{{item.extraRewardMoney}}
</p>
<p
v-if=
"item.extraDeductMoney>0"
>
额外扣除金额:{{item.extraDeductMoney}}
</p>
</div>
</div>
</td>
<td>
<p
v-if=
'item.isOwn==1||userId==1||userId==5||positionId==168 || isUpdateOrder'
...
...
src/components/SalesModule/salesHotelOrder.vue
0 → 100644
View file @
a28e0d25
<
style
>
.SalesHotelOrder
.SalesHotelOrderTable
{
width
:
100%
;
min-width
:
1500px
;
font-size
:
14px
;
color
:
#333
;
border-bottom
:
1px
solid
#cccccc
;
border-right
:
1px
solid
#cccccc
;
border-collapse
:
collapse
;
}
.SalesHotelOrder
.SalesHotelOrderTable
th
{
background
:
#e6e6e6
;
height
:
30px
;
font-size
:
12px
;
text-align
:
center
;
border-top
:
1px
solid
#cccccc
;
border-left
:
1px
solid
#cccccc
;
}
.SalesHotelOrder
.SalesHotelOrderTable
tr
td
{
height
:
60px
;
padding
:
10px
;
background-color
:
#fff
;
text-align
:
center
;
border-top
:
1px
solid
#cccccc
;
border-left
:
1px
solid
#cccccc
;
}
.SalesHotelOrder
.SalesHotelOrderTable
tbody
tr
:last-child
{
border-bottom
:
2px
solid
#333
;
}
.SalesHotelOrder
.SH_beizhu
{
float
:
left
;
}
.SalesHotelOrder
.SH_beizhuInner
{
float
:
left
;
width
:
85%
;
}
.SalesHotelOrder
.SH_OrderDan
>
div
{
display
:
inline-block
;
}
</
style
>
<
template
>
<div
class=
"flexOne SalesHotelOrder"
>
<div
class=
"query-box"
>
<ul>
<li>
<span><em>
酒店订单号
</em>
<el-input
v-model=
'msg.ThirdOrderNo'
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
</span>
</li>
<li>
<span>
<em>
入住开始时间
</em>
<el-date-picker
class=
"w150"
type=
"date"
v-model=
"msg.StartTime"
:picker-options=
"pickerBeginDateBefore"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
</span>
</li>
<li>
<span>
<em>
入住结束时间
</em>
<el-date-picker
class=
"w150"
type=
"date"
v-model=
"msg.EndTime"
:picker-options=
"pickerBeginDateAfter"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
</span>
</li>
<li>
<input
type=
"button"
class=
"hollowFixedBtn"
@
click=
"resetPageIndex();getList()"
:value=
"$t('pub.searchBtn')"
/>
</li>
</ul>
</div>
<table
class=
"SalesHotelOrderTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
"loading"
>
<tr>
<th>
订单号
</th>
<th>
客户信息
</th>
<th>
房间数
</th>
<th>
总价格
</th>
<th>
总收入
</th>
<th>
抵扣金额
</th>
<th>
优惠金额
</th>
<th>
待收金额
</th>
<th>
订单状态
</th>
<th>
创建时间
</th>
<th>
入住时间
</th>
<th>
离店时间
</th>
<th>
取消费用
</th>
<!--
<th>
操作
</th>
-->
</tr>
<tbody
v-for=
"(item,index) in dataList"
>
<tr>
<td
style=
"border-bottom:2px solid #333"
rowspan=
"2"
>
{{
item
.
ThirdOrderNo
}}
</td>
<td>
{{
item
.
Number
}}
</td>
<td>
<div>
{{
item
.
CustomerName
}}
</div>
<div>
{{
item
.
CustomerPhone
}}
</div>
</td>
<td>
{{
item
.
TotalPrice
}}
</td>
<td>
{{
item
.
Income
}}
</td>
<td>
{{
item
.
RedEnvelopeMoney
}}
</td>
<td>
{{
item
.
DiscountMoney
}}
</td>
<td>
{{
item
.
DueinMoney
}}
</td>
<td>
{{
item
.
OrderStatus
}}
</td>
<td>
{{
item
.
CreateDateStr
}}
</td>
<td>
{{
item
.
CheckInStr
}}
</td>
<td>
{{
item
.
CheckOutStr
}}
</td>
<td>
{{
item
.
CancelFee
}}
</td>
<!--
<td>
详情
</td>
-->
</tr>
<tr>
<td
colspan=
"6"
style=
"text-align:left;width:600px"
>
<div
class=
"clearfix"
>
<div
class=
"SH_beizhu"
style=
""
>
备注:
</div>
<div
class=
"SH_beizhuInner"
>
{{
item
.
Remark
}}
</div>
</div>
</td>
<td
colspan=
"6"
style=
"text-align:left;width:600px"
>
<div
class=
"SH_OrderDan"
>
<div>
收款单据:
</div>
<div>
<span
v-for=
"subItem in item.FinanceList"
>
{{
item
.
frID
}}
</span>
<span
v-if=
"item.FinanceList==0"
>
暂无数据
</span>
</div>
</div>
<div
class=
"SH_OrderDan"
>
<div>
付款单据:
</div>
<div>
<span
v-for=
"subItem in item.RefundFinanceList"
>
{{
item
.
frID
}}
</span>
<span
v-if=
"item.RefundFinanceList==0"
>
暂无数据
</span>
</div>
</div>
</td>
</tr>
</tbody>
</table>
<el-pagination
background
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"currentPage"
layout=
"total,prev, pager, next, jumper"
:page-size=
msg.pageSize
:total=
total
>
</el-pagination>
</div>
</
template
>
<
script
>
export
default
{
data
()
{
return
{
msg
:
{
pageIndex
:
1
,
pageSize
:
10
,
Source
:
-
1
,
ThirdOrderNo
:
''
,
StartTime
:
''
,
EndTime
:
''
,
GetOrderType
:
0
},
total
:
0
,
currentPage
:
1
,
loading
:
false
,
pickerBeginDateBefore
:
{
disabledDate
:
time
=>
{
if
(
this
.
msg
.
EndTime
==
null
)
{
return
false
;
}
else
{
let
endTime
=
new
Date
(
this
.
msg
.
EndTime
)
return
endTime
.
getTime
()
<
time
.
getTime
()
}
}
},
pickerBeginDateAfter
:
{
disabledDate
:
time
=>
{
let
startTime
=
new
Date
(
this
.
msg
.
StartTime
)
return
startTime
.
getTime
()
>=
time
.
getTime
()
}
},
dataList
:
[],
};
},
methods
:
{
getList
()
{
//获取现有线路列表
this
.
loading
=
true
;
this
.
apipost
(
"sellorder_post_GetJapanHotelOrderList"
,
this
.
msg
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
console
.
log
(
res
,
'resssss'
);
this
.
dataList
=
res
.
data
.
data
.
pageData
;
this
.
total
=
res
.
data
.
data
.
count
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
err
=>
{}
);
},
handleCurrentChange
(
val
)
{
this
.
msg
.
pageIndex
=
val
;
this
.
getList
();
},
resetPageIndex
()
{
this
.
msg
.
pageIndex
=
1
;
this
.
currentPage
=
1
},
},
mounted
()
{
this
.
getList
();
}
};
</
script
>
src/components/TravelManager/TravelList/OpHotelOrder.vue
0 → 100644
View file @
a28e0d25
<
style
>
.SalesHotelOrder
.SalesHotelOrderTable
{
width
:
100%
;
min-width
:
1500px
;
font-size
:
14px
;
color
:
#333
;
border-bottom
:
1px
solid
#cccccc
;
border-right
:
1px
solid
#cccccc
;
border-collapse
:
collapse
;
}
.SalesHotelOrder
.SalesHotelOrderTable
th
{
background
:
#e6e6e6
;
height
:
30px
;
font-size
:
12px
;
text-align
:
center
;
border-top
:
1px
solid
#cccccc
;
border-left
:
1px
solid
#cccccc
;
}
.SalesHotelOrder
.SalesHotelOrderTable
tr
td
{
height
:
60px
;
padding
:
10px
;
background-color
:
#fff
;
text-align
:
center
;
border-top
:
1px
solid
#cccccc
;
border-left
:
1px
solid
#cccccc
;
}
.SalesHotelOrder
.SalesHotelOrderTable
tbody
tr
:last-child
{
border-bottom
:
2px
solid
#333
;
}
.SalesHotelOrder
.SH_beizhu
{
float
:
left
;
}
.SalesHotelOrder
.SH_beizhuInner
{
float
:
left
;
width
:
85%
;
}
.SalesHotelOrder
.SH_OrderDan
>
div
{
display
:
inline-block
;
}
</
style
>
<
template
>
<div
class=
"flexOne SalesHotelOrder"
>
<div
class=
"query-box"
>
<ul>
<li>
<span><em>
酒店订单号
</em>
<el-input
v-model=
'msg.ThirdOrderNo'
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
</span>
</li>
<li>
<span>
<em>
入住开始时间
</em>
<el-date-picker
class=
"w150"
type=
"date"
v-model=
"msg.StartTime"
:picker-options=
"pickerBeginDateBefore"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
</span>
</li>
<li>
<span>
<em>
入住结束时间
</em>
<el-date-picker
class=
"w150"
type=
"date"
v-model=
"msg.EndTime"
:picker-options=
"pickerBeginDateAfter"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
</span>
</li>
<li>
<input
type=
"button"
class=
"hollowFixedBtn"
@
click=
"resetPageIndex();getList()"
:value=
"$t('pub.searchBtn')"
/>
</li>
</ul>
</div>
<table
class=
"SalesHotelOrderTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
"loading"
>
<tr>
<th>
订单号
</th>
<th>
客户信息
</th>
<th>
房间数
</th>
<th>
总价格
</th>
<th>
总收入
</th>
<th>
抵扣金额
</th>
<th>
优惠金额
</th>
<th>
待收金额
</th>
<th>
订单状态
</th>
<th>
创建时间
</th>
<th>
入住时间
</th>
<th>
离店时间
</th>
<th>
取消费用
</th>
<!--
<th>
操作
</th>
-->
</tr>
<tbody
v-for=
"(item,index) in dataList"
>
<tr>
<td
style=
"border-bottom:2px solid #333"
rowspan=
"2"
>
{{
item
.
ThirdOrderNo
}}
</td>
<td>
{{
item
.
Number
}}
</td>
<td>
<div>
{{
item
.
CustomerName
}}
</div>
<div>
{{
item
.
CustomerPhone
}}
</div>
</td>
<td>
{{
item
.
TotalPrice
}}
</td>
<td>
{{
item
.
Income
}}
</td>
<td>
{{
item
.
RedEnvelopeMoney
}}
</td>
<td>
{{
item
.
DiscountMoney
}}
</td>
<td>
{{
item
.
DueinMoney
}}
</td>
<td>
{{
item
.
OrderStatus
}}
</td>
<td>
{{
item
.
CreateDateStr
}}
</td>
<td>
{{
item
.
CheckInStr
}}
</td>
<td>
{{
item
.
CheckOutStr
}}
</td>
<td>
{{
item
.
CancelFee
}}
</td>
<!--
<td>
详情
</td>
-->
</tr>
<tr>
<td
colspan=
"6"
style=
"text-align:left;width:600px"
>
<div
class=
"clearfix"
>
<div
class=
"SH_beizhu"
style=
""
>
备注:
</div>
<div
class=
"SH_beizhuInner"
>
{{
item
.
Remark
}}
</div>
</div>
</td>
<td
colspan=
"6"
style=
"text-align:left;width:600px"
>
<div
class=
"SH_OrderDan"
>
<div>
收款单据:
</div>
<div>
<span
v-for=
"subItem in item.FinanceList"
>
{{
item
}}
</span>
<span
v-if=
"item.FinanceList==0"
>
暂无数据
</span>
</div>
</div>
<div
class=
"SH_OrderDan"
>
<div>
付款单据:
</div>
<div>
<span
v-for=
"subItem in item.RefundFinanceList"
>
{{
item
}}
</span>
<span
v-if=
"item.RefundFinanceList==0"
>
暂无数据
</span>
</div>
</div>
</td>
</tr>
</tbody>
</table>
<el-pagination
background
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"currentPage"
layout=
"total,prev, pager, next, jumper"
:page-size=
msg.pageSize
:total=
total
>
</el-pagination>
</div>
</
template
>
<
script
>
export
default
{
data
()
{
return
{
msg
:
{
pageIndex
:
1
,
pageSize
:
10
,
Source
:
-
1
,
ThirdOrderNo
:
''
,
StartTime
:
''
,
EndTime
:
''
,
GetOrderType
:
1
},
total
:
0
,
currentPage
:
1
,
loading
:
false
,
pickerBeginDateBefore
:
{
disabledDate
:
time
=>
{
if
(
this
.
msg
.
EndTime
==
null
)
{
return
false
;
}
else
{
let
endTime
=
new
Date
(
this
.
msg
.
EndTime
)
return
endTime
.
getTime
()
<
time
.
getTime
()
}
}
},
pickerBeginDateAfter
:
{
disabledDate
:
time
=>
{
let
startTime
=
new
Date
(
this
.
msg
.
StartTime
)
return
startTime
.
getTime
()
>=
time
.
getTime
()
}
},
dataList
:
[],
};
},
methods
:
{
getList
()
{
//获取现有线路列表
this
.
loading
=
true
;
this
.
apipost
(
"sellorder_post_GetJapanHotelOrderList"
,
this
.
msg
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
console
.
log
(
res
,
'resssss'
);
this
.
dataList
=
res
.
data
.
data
.
pageData
;
this
.
total
=
res
.
data
.
data
.
count
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
err
=>
{}
);
},
handleCurrentChange
(
val
)
{
this
.
msg
.
pageIndex
=
val
;
this
.
getList
();
},
resetPageIndex
()
{
this
.
msg
.
pageIndex
=
1
;
this
.
currentPage
=
1
},
},
mounted
()
{
this
.
getList
();
}
};
</
script
>
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
a28e0d25
...
...
@@ -1805,6 +1805,17 @@
<p
v-if=
'childItem.CommissionMoney'
style=
"color:red"
>
提成:
{{
childItem
.
CommissionMoney
}}
</p>
<p
v-else-if=
"childItem.LatestCommissionMoney"
style=
"color:red"
>
提成:
{{
childItem
.
LatestCommissionMoney
}}
</p>
<div>
<div
style=
"color:green"
v-if=
"childItem.CommissionMoney==''||childItem.CommissionMoney=='-1'"
>
<p
v-if=
"childItem.ExtraRewardMoney>0"
>
额外奖励金额:
{{
childItem
.
ExtraRewardMoney
}}
</p>
<p
v-if=
"childItem.ExtraDeductMoney>0"
>
额外扣除金额:
{{
childItem
.
ExtraDeductMoney
}}
</p>
</div>
<div
style=
"color:red"
v-else
>
<p
v-if=
"childItem.ExtraRewardMoney>0"
>
额外奖励金额:
{{
childItem
.
ExtraRewardMoney
}}
</p>
<p
v-if=
"childItem.ExtraDeductMoney>0"
>
额外扣除金额:
{{
childItem
.
ExtraDeductMoney
}}
</p>
</div>
</div>
</td>
<td>
<p
v-if=
"childItem.IsOwn==1||userId==1||userId==5"
class=
"fz12 over_ellipsis"
style=
"width:90%;"
...
...
@@ -3155,7 +3166,6 @@
});
},
getRedBag
(
item
){
console
.
log
(
item
);
let
msg
=
{
CustomerId
:
item
.
CustomerId
,
pageIndex
:
1
,
...
...
@@ -3249,7 +3259,6 @@
},
// 点击弹出下拉框
getDetail
(
obj
)
{
console
.
log
(
obj
)
this
.
Ysze
=
false
;
this
.
starTime
=
obj
.
StartDate
;
this
.
endTime
=
obj
.
BackDate
;
...
...
@@ -3847,7 +3856,6 @@
}
},
getTotalPrice
(
t
)
{
console
.
log
(
t
)
if
(
t
===
3
)
{
if
(
parseFloat
(
this
.
addMsg
.
Unit_Price
).
toString
()
===
"NaN"
)
{
this
.
$message
.
error
(
'请输入正确的价格!'
)
...
...
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @
a28e0d25
...
...
@@ -222,6 +222,19 @@
<p
class=
"fz12 over_ellipsis"
>
下单时间:
{{
item
.
createDate
}}
</p>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;"
>
{{
item
.
commissionSPeopleName
==
'无'
?
''
:
item
.
commissionSPeopleName
}}
</p>
<p
v-if=
'item.commissionMoney'
style=
"color:red"
>
提成:
{{
item
.
commissionMoney
}}
</p>
<p
v-else-if=
"item.commissionMoney"
style=
"color:red"
>
提成:
{{
item
.
latestCommissionMoney
}}
</p>
<div>
<div
style=
"color:green"
v-if=
"item.commissionMoney==''||item.commissionMoney=='-1'"
>
<p
v-if=
"item.extraRewardMoney>0"
>
额外奖励金额:
{{
item
.
extraRewardMoney
}}
</p>
<p
v-if=
"item.extraDeductMoney>0"
>
额外扣除金额:
{{
item
.
extraDeductMoney
}}
</p>
</div>
<div
style=
"color:red"
v-else
>
<p
v-if=
"item.extraRewardMoney>0"
>
额外奖励金额:
{{
item
.
extraRewardMoney
}}
</p>
<p
v-if=
"item.extraDeductMoney>0"
>
额外扣除金额:
{{
item
.
extraDeductMoney
}}
</p>
</div>
</div>
</td>
<td>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;"
>
{{
item
.
orderTypeName
}}
</p>
...
...
src/components/personalCenter/index.vue
View file @
a28e0d25
...
...
@@ -181,7 +181,8 @@ export default {
},
result
:
null
,
orders
:
[],
pageLoading
:
false
pageLoading
:
false
,
};
},
components
:
{
...
...
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @
a28e0d25
...
...
@@ -4,6 +4,7 @@
<ul>
<li>
<input
v-if=
"IsOperation !=1"
type=
"button"
class=
"fr normalBtn mb30"
value=
"保存"
@
click=
"saveList(1)"
/>
<input
style=
"display:none;"
type=
"button"
class=
"fr normalBtn mb30"
value=
"保存"
@
click=
"saveList(1)"
/>
<input
v-if=
"IsOperation !=1"
type=
"button"
class=
"fr normalBtn mb30"
value=
"保存草稿"
@
click=
"saveList(0)"
/>
</li>
</ul>
...
...
src/components/scenicSpot/scenicSpotInfoManage.vue
View file @
a28e0d25
...
...
@@ -739,6 +739,9 @@
<el-switch
v-model=
"isBook"
active-color=
"#13ce66"
inactive-color=
"#ff4949"
active-text=
"供应商"
inactive-text=
"自订"
></el-switch>
</el-form-item>
<el-form-item
label=
"是否包含领队"
>
<el-switch
v-model=
"addMsg.IsIncludeLeader"
:active-value=
"0"
:inactive-value=
"1"
></el-switch>
</el-form-item>
</div>
<span
class=
"resource-lititle"
>
{{
$t
(
'hotel.hotel_imgintroduce'
)
}}
</span>
<div
class=
"resource-list"
>
...
...
@@ -893,6 +896,7 @@
PayStyle
:
0
,
PlayTimeHour
:
""
,
//游玩小时
PlayTimeMinutes
:
""
,
//游玩分钟
IsIncludeLeader
:
0
,
//是否包含领队:0-包含,1-不包含
},
rules
:
{
//表单必填验证
...
...
@@ -1127,7 +1131,6 @@
);
},
goUrl
(
path
)
{
// this.$router.push({ path: path });
this
.
$router
.
push
({
path
:
path
,
query
:
{
...
...
src/components/visualization/dailyAnalysis.vue
View file @
a28e0d25
This diff is collapsed.
Click to expand it.
src/components/visualization/nianduduibi.vue
0 → 100644
View file @
a28e0d25
<
template
>
<div
class=
"inerank-container"
>
<div
:style=
"
{height:'100%',width:'100%'}" ref="myLineRank">
</div>
</div>
</
template
>
<
script
>
export
default
{
props
:
{
newdata
:
{
type
:
Number
,
default
:
0
},
olddata
:
{
type
:
Number
,
default
:
0
},
colors
:{
type
:
Array
,
default
:[]
},
title
:{
type
:
String
,
default
:
""
}
},
data
()
{
return
{
placeHolderStyle
:
{
normal
:
{
color
:
"rgba(0,0,0,0)"
,
label
:
{
show
:
false
},
labelLine
:
{
show
:
false
}
},
emphasis
:
{
color
:
"rgba(0,0,0,0)"
}
}
};
},
mounted
()
{
this
.
init
();
},
methods
:
{
init
()
{
let
myChart
=
this
.
$echarts
.
init
(
this
.
$refs
.
myLineRank
);
let
dataAlias
=
[
"今年"
,
"去年"
];
let
data2
=
[{
name
:
"今年"
,
value
:
this
.
newdata
},
{
name
:
"去年"
,
value
:
this
.
olddata
,
itemStyle
:
this
.
placeHolderStyle
}];
let
data3
=
[{
name
:
"去年"
,
value
:
this
.
olddata
},{
name
:
"今年"
,
value
:
this
.
newdata
,
itemStyle
:
this
.
placeHolderStyle
}];
let
option
=
{
tooltip
:
{
show
:
false
},
graphic
:
[
{
type
:
"text"
,
left
:
'center'
,
top
:
"center"
,
style
:
{
text
:
this
.
title
,
textAlign
:
"center"
,
fill
:
this
.
colors
[
0
],
//文字的颜色
fontSize
:
16
,
width
:
120
,
fontFamily
:
"pingfangR"
}
}
],
calculable
:
true
,
series
:
[
{
// center: ["25%", "45%"],
name
:
"订单来源"
,
type
:
"pie"
,
radius
:
[
"80%"
,
"90%"
],
hoverAnimation
:
false
,
legendHoverLink
:
false
,
tooltip
:
false
,
startAngle
:
90
,
itemStyle
:
{
emphasis
:
{
barBorderRadius
:
30
},
normal
:
{
label
:
{
show
:
false
},
labelLine
:
{
show
:
false
},
color
:
new
this
.
$echarts
.
graphic
.
LinearGradient
(
1
,
0
,
0
,
0
,
[
{
offset
:
0
,
color
:
"#00BFF9"
},
{
offset
:
0.35
,
color
:
"#0067CC"
},
{
offset
:
1
,
color
:
"#0067CC"
}
])
}
},
data
:
data2
},
{
// center: ["25%", "45%"],
name
:
"订单来源"
,
type
:
"pie"
,
radius
:
[
"60%"
,
"70%"
],
hoverAnimation
:
false
,
legendHoverLink
:
false
,
tooltip
:
false
,
startAngle
:
90
,
itemStyle
:
{
emphasis
:
{
barBorderRadius
:
30
},
normal
:
{
label
:
{
show
:
false
},
labelLine
:
{
show
:
false
},
color
:
new
this
.
$echarts
.
graphic
.
LinearGradient
(
1
,
0
,
0
,
0
,
[
{
offset
:
0
,
color
:
this
.
colors
[
1
]
},
{
offset
:
0.35
,
color
:
this
.
colors
[
0
]
},
{
offset
:
1
,
color
:
this
.
colors
[
0
]
}
])
}
},
data
:
data3
}
]
};
myChart
.
setOption
(
option
);
}
}
};
</
script
>
<
style
>
.inerank-container
{
height
:
100%
;
width
:
100%
;
}
</
style
>
src/components/visualization/nianduzoushi.vue
0 → 100644
View file @
a28e0d25
<
template
>
<div
class=
"inerank-container"
>
<div
:style=
"
{height:'100%',width:'100%'}" ref="myLineRank">
</div>
</div>
</
template
>
<
script
>
export
default
{
props
:
{
data
:
{
type
:
Array
,
default
:
[]
}
},
data
()
{
return
{};
},
mounted
()
{
this
.
init
();
},
methods
:
{
init
()
{
let
myChart
=
this
.
$echarts
.
init
(
this
.
$refs
.
myLineRank
);
var
dataAxis
=
[];
var
data2
=
[];
var
data4
=
[];
var
data3
=
[];
this
.
data
.
forEach
(
x
=>
{
dataAxis
.
push
(
x
.
Month
+
"月"
);
data2
.
push
(
x
.
NowSaleMoney
);
data4
.
push
(
x
.
NowSaleDueIn
);
data3
.
push
(
x
.
NowSaleGuest
);
});
let
option
=
{
title
:
{
show
:
false
},
xAxis
:
{
data
:
dataAxis
,
axisLabel
:
{
textStyle
:
{
color
:
"#DADADA"
,
fontSize
:
12
},
margin
:
10
,
interval
:
0
,
show
:
true
},
type
:
"category"
,
axisTick
:
{
show
:
true
},
axisLine
:
{
show
:
true
,
lineStyle
:
{
color
:
[
"#12397C"
]
}
}
},
yAxis
:
[
{
axisLine
:
{
show
:
true
,
lineStyle
:
{
color
:
[
"#12397C"
]
}
},
axisTick
:
{
show
:
false
},
axisLabel
:
{
textStyle
:
{
color
:
"#DADADA"
,
fontSize
:
12
},
show
:
true
},
splitLine
:
{
show
:
true
,
lineStyle
:
{
color
:
[
"#12397c4d"
]
}
},
min
:
0
,
name
:
"金额(元)"
,
type
:
"value"
},
{
axisLine
:
{
show
:
true
,
lineStyle
:
{
color
:
[
"#12397C"
]
}
},
axisTick
:
{
show
:
false
},
axisLabel
:
{
textStyle
:
{
color
:
"#DADADA"
,
fontSize
:
12
},
show
:
true
},
splitLine
:
{
show
:
true
,
lineStyle
:
{
color
:
[
"#12397c4d"
]
}
},
min
:
0
,
name
:
"收客数(人)"
,
type
:
"value"
}
],
grid
:
{
left
:
"68"
,
right
:
"60"
,
top
:
"50"
,
bottom
:
"30"
},
tooltip
:
{
trigger
:
"item"
,
axisPointer
:
{
type
:
"none"
,
snap
:
true
,
label
:
{
backgroundColor
:
"#6a7985"
}
}
},
series
:
[
{
type
:
"bar"
,
itemStyle
:
{
normal
:
{
color
:
new
this
.
$echarts
.
graphic
.
LinearGradient
(
0
,
0
,
0
,
1
,
[
{
offset
:
0
,
color
:
"#4487F0"
},
{
offset
:
0.3
,
color
:
"#4487F0"
},
{
offset
:
1
,
color
:
"#B0D0F8"
}
])
}
},
barWidth
:
24
,
data
:
data2
,
yAxisIndex
:
0
,
animationType
:
"scale"
,
animationEasing
:
"elasticOut"
,
animationDelay
:
function
(
idx
)
{
return
Math
.
random
()
*
200
;
}
},
{
type
:
"bar"
,
itemStyle
:
{
normal
:
{
color
:
new
this
.
$echarts
.
graphic
.
LinearGradient
(
0
,
0
,
0
,
1
,
[
{
offset
:
0
,
color
:
"#FD3C7C"
},
{
offset
:
0.5
,
color
:
"#FD3C7C"
},
{
offset
:
1
,
color
:
"#FFABC7"
}
])
}
},
barWidth
:
24
,
data
:
data4
,
yAxisIndex
:
0
,
animationType
:
"scale"
,
animationEasing
:
"elasticOut"
,
animationDelay
:
function
(
idx
)
{
return
Math
.
random
()
*
200
;
}
},
{
type
:
"line"
,
smooth
:
true
,
symbol
:
'circle'
,
symbolSize
:
5
,
yAxisIndex
:
1
,
// left: "0",
itemStyle
:
{
normal
:
{
lineStyle
:
{
color
:
"#FFB822"
},
color
:
"#FFB822"
}
},
data
:
data3
}
]
};
myChart
.
setOption
(
option
);
}
}
};
</
script
>
<
style
>
.inerank-container
{
height
:
100%
;
width
:
100%
;
}
</
style
>
src/components/visualization/pingtai.vue
View file @
a28e0d25
...
...
@@ -31,7 +31,6 @@ export default {
data2
.
push
(
t
)
}
})
console
.
log
(
dataAlias
)
let
option
=
{
tooltip
:
{
trigger
:
"item"
,
...
...
src/components/visualization/progress.vue
View file @
a28e0d25
...
...
@@ -157,7 +157,7 @@ export default {
.inerank-container
.h-title
{
position
:
absolute
;
left
:
0%
;
bottom
:
1
4
px
;
bottom
:
1
0
px
;
font-size
:
12px
;
color
:
#46c3f1
;
text-align
:
center
;
...
...
src/router/config.js
View file @
a28e0d25
...
...
@@ -1710,6 +1710,14 @@ export default {
title
:
'团队收支'
},
},
{
path
:
'/OpHotelOrder'
,
//操作 散卖酒店订单
name
:
'OpHotelOrder'
,
component
:
resolve
=>
require
([
'@/components/TravelManager/TravelList/OpHotelOrder'
],
resolve
),
meta
:
{
title
:
'散卖酒店订单'
},
},{
path
:
'/AmoebaDetail'
,
//阿米巴结算详情
name
:
'AmoebaDetail'
,
component
:
resolve
=>
require
([
'@/components/TravelManager/TravelList/AmoebaDetail'
],
resolve
),
...
...
@@ -2219,7 +2227,14 @@ export default {
title
:
'散卖机票订单'
},
},
{
//销售 散卖酒店订单
path
:
'/salesHotelOrder'
,
name
:
'salesHotelOrder'
,
component
:
resolve
=>
require
([
'@/components/SalesModule/salesHotelOrder'
],
resolve
),
meta
:
{
title
:
'散卖酒店订单'
},
},
{
// 销售 报名统计
path
:
'/enrollTotal'
,
name
:
'enrollTotal'
,
...
...
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