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
1a937002
Commit
1a937002
authored
Jul 15, 2019
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面返佣金额计算
parent
bacd56a8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
3 deletions
+27
-3
roomReservationsDetails.vue
src/components/Hotel/roomReservationsDetails.vue
+2
-1
leaderReimbursement.vue
src/components/LeaderManagement/leaderReimbursement.vue
+25
-2
No files found.
src/components/Hotel/roomReservationsDetails.vue
View file @
1a937002
...
@@ -682,7 +682,7 @@
...
@@ -682,7 +682,7 @@
this
.
CreateByPhoto
=
res
.
data
.
data
.
CreateByPhoto
;
this
.
CreateByPhoto
=
res
.
data
.
data
.
CreateByPhoto
;
this
.
CreateByAccount
=
res
.
data
.
data
.
CreateByAccount
;
this
.
CreateByAccount
=
res
.
data
.
data
.
CreateByAccount
;
if
(
list
!=
null
&&
list
.
length
>
0
)
{
if
(
list
!=
null
&&
list
.
length
>
0
)
{
list
.
forEach
(
item
=>
{
list
.
forEach
(
(
item
,
sIndex
)
=>
{
item
.
HotelOrderList
.
forEach
(
subItem
=>
{
item
.
HotelOrderList
.
forEach
(
subItem
=>
{
subItem
.
hotelList
.
push
({
subItem
.
hotelList
.
push
({
Name
:
subItem
.
NewHotelName
,
Name
:
subItem
.
NewHotelName
,
...
@@ -702,6 +702,7 @@
...
@@ -702,6 +702,7 @@
})
})
});
});
this
.
list
=
list
;
this
.
list
=
list
;
this
.
$forceUpdate
();
this
.
$forceUpdate
();
}
}
}
else
{
}
else
{
...
...
src/components/LeaderManagement/leaderReimbursement.vue
View file @
1a937002
...
@@ -132,7 +132,7 @@
...
@@ -132,7 +132,7 @@
</table>
</table>
<table
class=
"leaderReimbursementTable"
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
>
<table
class=
"leaderReimbursementTable"
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
>
<tr>
<tr>
<th
colspan=
"2
1
"
class=
"bgwhite"
>
酒店使用
</th>
<th
colspan=
"2
2
"
class=
"bgwhite"
>
酒店使用
</th>
</tr>
</tr>
<tr
class=
"title"
>
<tr
class=
"title"
>
<th
width=
"100"
>
使用时间
</th>
<th
width=
"100"
>
使用时间
</th>
...
@@ -147,6 +147,7 @@
...
@@ -147,6 +147,7 @@
<th
width=
""
>
金额小计
</th>
<th
width=
""
>
金额小计
</th>
<th
width=
""
>
返佣类型
</th>
<th
width=
""
>
返佣类型
</th>
<th
width=
""
>
返佣
</th>
<th
width=
""
>
返佣
</th>
<th
width=
""
>
返佣金额
</th>
<th
width=
""
>
入汤税
</th>
<th
width=
""
>
入汤税
</th>
<th
width=
""
>
城市税
</th>
<th
width=
""
>
城市税
</th>
<th
width=
""
>
停车费
</th>
<th
width=
""
>
停车费
</th>
...
@@ -223,6 +224,28 @@
...
@@ -223,6 +224,28 @@
<td>
<td>
{{childItem.RebateRatio}} %
{{childItem.RebateRatio}} %
</td>
</td>
<td>
<!--含税-->
<
template
v-if=
"subItem.RebateType==1"
>
<!--税别-->
<template
v-if=
"subItem.TaxType==2"
>
{{
(
childItem
.
UnitPrice
*
(
childItem
.
BookNum
-
childItem
.
HotelDiscount
)
*
(
1
+
0.08
)
*
(
childItem
.
RebateRatio
/
100
)).
toFixed
(
2
)
}}
</
template
>
<
template
v-else
>
{{
(
childItem
.
UnitPrice
*
(
childItem
.
BookNum
-
childItem
.
HotelDiscount
)
*
(
1
)
*
(
childItem
.
RebateRatio
/
100
)).
toFixed
(
2
)
}}
</
template
>
</template>
<!--不含税-->
<
template
v-else
>
<!--税别-->
<template
v-if=
"subItem.TaxType==2"
>
{{
(
childItem
.
UnitPrice
*
(
childItem
.
BookNum
-
childItem
.
HotelDiscount
)
*
(
1
+
0.08
)
*
(
childItem
.
RebateRatio
/
100
)).
toFixed
(
2
)
}}
</
template
>
<
template
v-else
>
{{
(
childItem
.
UnitPrice
*
(
childItem
.
BookNum
-
childItem
.
HotelDiscount
)
*
(
1
)
*
(
childItem
.
RebateRatio
/
100
)).
toFixed
(
2
)
}}
</
template
>
</template>
</td>
<td
v-if=
"childIndex==0"
:rowspan=
"6"
>
<td
v-if=
"childIndex==0"
:rowspan=
"6"
>
{{subItem.InTangTax}}
{{subItem.InTangTax}}
</td>
</td>
...
@@ -276,7 +299,7 @@
...
@@ -276,7 +299,7 @@
</template>
</template>
<tr
v-if=
"TotalNav.reimburseTotalPrice"
>
<tr
v-if=
"TotalNav.reimburseTotalPrice"
>
<td>
总金额
</td>
<td>
总金额
</td>
<td
colspan=
"2
0
"
>
<td
colspan=
"2
1
"
>
{{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}}
{{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}}
</td>
</td>
</tr>
</tr>
...
...
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