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
c34dce31
Commit
c34dce31
authored
Aug 12, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
ae58b7e6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
leaderReimbursement.vue
src/components/LeaderManagement/leaderReimbursement.vue
+2
-2
TeamBalancePayment.vue
...omponents/TravelManager/TravelList/TeamBalancePayment.vue
+2
-2
No files found.
src/components/LeaderManagement/leaderReimbursement.vue
View file @
c34dce31
...
...
@@ -243,7 +243,7 @@
</p>
</td>
<td
style=
"white-space:nowrap; "
>
{{subItem.PayStyle === 1
&&
subItem.DMCPayType
!== 9
? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
{{subItem.PayStyle === 1
&&
subItem.DMCPayType
== 1
? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
</td>
<td
v-if=
"childIndex==0"
:rowspan=
"6"
>
<
template
v-if=
"subItem.RebateType==1"
>
...
...
@@ -1014,7 +1014,7 @@
coefficient
=
1
+
0.08
;
}
if
(
obj
.
PayStyle
===
1
)
{
if
(
index
==
4
&&
obj
.
DMCPayType
==
9
)
{
if
(
index
==
4
&&
obj
.
DMCPayType
!==
1
)
{
totalPrice
+=
0
;
}
else
{
totalPrice
+=
item
.
UnitPrice
*
(
item
.
BookNum
-
item
.
HotelDiscount
)
*
(
coefficient
-
item
.
RebateRatio
/
...
...
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @
c34dce31
...
...
@@ -419,7 +419,7 @@
<th
width=
"200"
>
当前审核人
</th>
</tr>
<
template
v-for=
"item in DataList.FiniceReciveList"
>
<tr
v-if=
"isExists(item.CostTypeList,'自费')"
>
<tr
v-if=
"isExists(item.CostTypeList,'自费')
|| isExists(item.CostTypeList,'自费收支结算')
"
>
<td><span
class=
"Team_income"
@
click=
"goUrl('FinancialDocumentsDetail',item.FrID)"
>
{{
item
.
FrID
}}
</span>
</td>
<td><span
v-for=
"subItem in item.CostTypeList"
:key=
"subItem.subCode"
>
{{
subItem
}}
</span></td>
...
...
@@ -1712,7 +1712,7 @@
this
.
moneyAll
.
otheryTotalsf
+=
item
.
PayMoney
;
}
// 收入 自费
if
(
that
.
isExists
(
item
.
CostTypeList
,
'自费'
))
{
if
(
that
.
isExists
(
item
.
CostTypeList
,
'自费'
)
||
that
.
isExists
(
item
.
CostTypeList
,
'自费收支结算'
)
)
{
this
.
moneyAll
.
zifeiys
+=
item
.
Money
;
this
.
moneyAll
.
zifeiss
+=
item
.
PayMoney
;
this
.
moneyAll
.
otheryTotalyf
+=
item
.
Money
;
...
...
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