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
cea0ab20
Commit
cea0ab20
authored
Apr 26, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
团队收支驳回优化
parent
d1a681c3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
55 additions
and
3 deletions
+55
-3
OrderList.vue
src/components/SingleAirTicket/components/OrderList.vue
+1
-1
TeamBalancePayment.vue
...omponents/TravelManager/TravelList/TeamBalancePayment.vue
+54
-2
No files found.
src/components/SingleAirTicket/components/OrderList.vue
View file @
cea0ab20
...
...
@@ -603,7 +603,7 @@
<span
:class=
"
{'cF1416C':scope.row.DueinMoney>0}">
{{
scope
.
row
.
DueinMoney
}}
</span>
</
template
>
</el-table-column>
<el-table-column
v-if=
"item.
commissionMoney&&item.commissionMoney
>0"
label=
"提成"
style=
"background:#EAEAEA"
>
<el-table-column
v-if=
"item.
SellCommission&&item.SellCommission
>0"
label=
"提成"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<commissionDialog
:objNew=
"scope.row"
></commissionDialog>
</
template
>
...
...
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @
cea0ab20
...
...
@@ -317,11 +317,61 @@
</el-row>
</div>
<div
style=
"font-size: 15px;margin-top: 10px;"
v-if=
"auditCoun>0"
>
当前有
<span
style=
"color: red;margin: 0 2px;"
>
{{auditCoun}}
</span>
条数据不计入利润
</div>
</div>
<div
class=
"Team_collection"
v-loading=
"loading"
>
<div
class=
"clearfix TB_PrintDiv"
>
<div
style=
"font-size: 15px;margin-top: 10px;"
v-if=
"auditCoun>0"
>
当前有
<span
style=
"color: red;margin: 0 2px;"
>
{{auditCoun}}
</span>
条数据不计入利润
</div>
<div
class=
"TB_comtitle TB-Title"
>
驳回:
</div>
</div>
<table
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<tr>
<th
width=
"180"
>
单号
</th>
<th
width=
"200"
>
费用类型
</th>
<th
width=
"500"
>
交易明细
</th>
<th
width=
"300"
>
金额
</th>
<th
width=
"200"
>
交易日期
</th>
<th
width=
"250"
>
制单人员
</th>
<th
width=
'180'
>
审核状态
</th>
<th
width=
"200"
>
当前审核人
</th>
</tr>
<
template
v-for=
"item in auditList"
>
<tr
v-if=
"NotExists(item.CostTypeList,'领队奖励金')&&NotExists(item.CostTypeList,'机票折让费')&&NotExists(item.CostTypeList,'签证费')&&NotExists(item.CostTypeList,'签证佣金') && NotExists(item.CostTypeList,'地接费(领取)') && NotExists(item.CostTypeList,'地接费(结算)') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表费') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 && NotExists(item.CostTypeList,'国际段机票') && NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿') && NotExists(item.CostTypeList,'保险费') && NotExists(item.CostTypeList,'旅游责任险')&& NotExists(item.CostTypeList,'团队保险')"
>
<td>
<!--
<el-checkbox
v-model=
"item.checked"
></el-checkbox>
-->
<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
}}
<br
/></span></td>
<td>
<div
class=
"Team_ComCoin"
v-for=
"childItem in item.TradeWayList"
>
支付方式:
{{
childItem
.
Alias
}}
币种:
{{
childItem
.
CurrencyName
}}
<span
class=
"Team_Coins"
>
{{
childItem
.
OriginalMoney
}}
*
{{
childItem
.
Rate
}}
</span>
<span
class=
"TB_Rate"
>
汇率
{{
childItem
.
Rate
}}
</span>
</div>
</td>
<td
style=
"font-size:14px;"
>
应付:
{{
item
.
Money
}}
<br
/>
实付:
{{
item
.
PayMoney
}}
</td>
<td>
{{
item
.
TradeDate
}}
</td>
<td>
<div>
{{
item
.
EmName
}}
</div>
<div
class=
"Team_btmDiv"
>
{{
item
.
CreateDate
}}
</div>
</td>
<td>
{{
item
.
StatusStr
}}
</td>
<td>
<div
v-for=
"AuditItem in item.AuditList"
>
{{
AuditItem
.
EmName
}}
<span
class=
"TB_Rate"
>
{{
AuditItem
.
AuditDate
}}
</span>
</div>
</td>
</tr>
</
template
>
</table>
<div
class=
"clearfix TB_PrintDiv"
>
<div
class=
"TB_comtitle TB-Title"
>
收入
</div>
<
template
v-if=
"IsHaveAuth"
>
...
...
@@ -1542,6 +1592,7 @@
export
default
{
data
()
{
return
{
auditList
:
[],
auditCoun
:
0
,
ticketList
:[],
tipdialog
:
false
,
...
...
@@ -1692,6 +1743,7 @@
this
.
apipost
(
'Financial_post_GetALLPageList'
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
data
=
res
.
data
.
data
.
pageData
.
list
;
this
.
auditList
=
data
this
.
auditCoun
=
res
.
data
.
data
.
count
;
}
else
{
...
...
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