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
4a0148fa
Commit
4a0148fa
authored
May 21, 2019
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
团队收支名称增加其他收入统计项
parent
2c7c32e8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
46 additions
and
1 deletion
+46
-1
TeamBalancePayment.vue
...omponents/TravelManager/TravelList/TeamBalancePayment.vue
+46
-1
No files found.
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @
4a0148fa
...
...
@@ -170,7 +170,7 @@
<div
class=
"Team_firstTitle"
>
<span
class=
"Team_comCoinType Team_shou"
>
<i
class=
"iconfont icon-qian"
></i>
</span>
收入
</span>
团费
收入
</div>
<div
class=
"Team_Incontent"
>
<div>
应收
<span>
¥
{{
DataList
.
TeamBalance
.
ShouldReceive
}}
</span></div>
...
...
@@ -181,6 +181,23 @@
</div>
</div>
</div>
</el-col>
<el-col
:span=
"3"
>
<div
class=
"Team_DList"
>
<div
class=
"Team_firstTitle"
>
<span
class=
"Team_comCoinType Team_shou"
>
<i
class=
"iconfont icon-qian"
></i>
</span>
其他收入
</div>
<div
class=
"Team_Incontent"
>
<div>
应收
<span>
¥
{{
moneyFormat
(
moneyAll
.
otheryTotalyf
)
}}
</span></div>
<div>
实收
<span
class=
"Team_Coins"
>
¥
{{
moneyFormat
(
moneyAll
.
otheryTotalsf
)
}}
</span></div>
<div>
待收
<span
class=
"Team_Coins"
>
¥
{{
moneyFormat
(
moneyAll
.
otheryTotalyf
-
moneyAll
.
otheryTotalsf
)
}}
</span></div>
<!--
<div>
注:应收=订单应收总额,实收=订单实收总额
</div>
-->
</div>
</div>
</el-col>
<el-col
:span=
"4"
>
<div
class=
"Team_DList"
>
...
...
@@ -1363,6 +1380,10 @@
// 导游
Guideyf
:
0
,
Guidesf
:
0
,
// 其他总收入
otheryTotalyf
:
0
,
otheryTotalsf
:
0
,
},
AllCont
:
{
Income
:
0
,
...
...
@@ -1505,6 +1526,9 @@
this
.
moneyAll
.
leadersf
=
0
;
this
.
moneyAll
.
Guideyf
=
0
;
this
.
moneyAll
.
Guidesf
=
0
;
this
.
moneyAll
.
otheryTotalyf
=
0
;
this
.
moneyAll
.
otheryTotalsf
=
0
;
this
.
loading
=
true
;
let
msg
=
{
TCID
:
this
.
TCID
...
...
@@ -1527,21 +1551,29 @@
if
(
that
.
isExists
(
item
.
CostTypeList
,
'地接费(结算)'
))
{
this
.
moneyAll
.
dijieys
+=
item
.
Money
;
this
.
moneyAll
.
dijiess
+=
item
.
PayMoney
;
this
.
moneyAll
.
otheryTotalyf
+=
item
.
Money
;
this
.
moneyAll
.
otheryTotalsf
+=
item
.
PayMoney
;
}
// 收入 自费
if
(
that
.
isExists
(
item
.
CostTypeList
,
'自费'
))
{
this
.
moneyAll
.
zifeiys
+=
item
.
Money
;
this
.
moneyAll
.
zifeiss
+=
item
.
PayMoney
;
this
.
moneyAll
.
otheryTotalyf
+=
item
.
Money
;
this
.
moneyAll
.
otheryTotalsf
+=
item
.
PayMoney
;
}
// 收入 小费
if
(
that
.
isExists
(
item
.
CostTypeList
,
'小费'
))
{
this
.
moneyAll
.
xiaofeiys
+=
item
.
Money
;
this
.
moneyAll
.
xiaofeiss
+=
item
.
PayMoney
;
this
.
moneyAll
.
otheryTotalyf
+=
item
.
Money
;
this
.
moneyAll
.
otheryTotalsf
+=
item
.
PayMoney
;
}
// 收入 佣金
if
(
item
.
OrderSource
===
7
)
{
this
.
moneyAll
.
yongjinys
+=
item
.
Money
;
this
.
moneyAll
.
yongjinss
+=
item
.
PayMoney
;
this
.
moneyAll
.
otheryTotalyf
+=
item
.
Money
;
this
.
moneyAll
.
otheryTotalsf
+=
item
.
PayMoney
;
}
// 收入 其他
if
(
that
.
NotExists
(
item
.
CostTypeList
,
'团费'
)
&&
that
.
NotExists
(
item
.
CostTypeList
,
'小费'
)
&&
that
...
...
@@ -1631,7 +1663,20 @@
}
})
// if(this.moneyAll.dijieys>0 || this.moneyAll.dijiess>0){
// }
// if(this.moneyAll.zifeiys>0 || this.moneyAll.zifeiss>0){
// this.moneyAll.otheryTotalyf+=this.moneyAll.zifeiys;
// this.moneyAll.otheryTotalsf+=this.moneyAll.zifeiss;
// }
// if(this.moneyAll.xiaofeiys>0 || this.moneyAll.xiaofeiss>0){
// this.moneyAll.otheryTotalyf+=this.moneyAll.xiaofeiys;
// this.moneyAll.otheryTotalsf+=this.moneyAll.xiaofeiss;
// } if(this.moneyAll.yongjinys>0 || this.moneyAll.yongjinss>0){
// this.moneyAll.otheryTotalyf+=this.moneyAll.yongjinys;
// this.moneyAll.otheryTotalsf+=this.moneyAll.yongjinss;
// }
}
});
},
...
...
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