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
5039061a
Commit
5039061a
authored
Jul 04, 2019
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
443c9397
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
60 additions
and
28 deletions
+60
-28
FinancialDocumentsDetail.vue
src/components/FinancialModule/FinancialDocumentsDetail.vue
+1
-1
TicketAmiba.vue
src/components/Ticketing/TicketAmiba.vue
+41
-8
AmoebaDetail.vue
src/components/TravelManager/TravelList/AmoebaDetail.vue
+1
-3
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+0
-15
TeamBalancePayment.vue
...omponents/TravelManager/TravelList/TeamBalancePayment.vue
+17
-1
No files found.
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @
5039061a
...
...
@@ -786,7 +786,7 @@
<img
v-for=
"src in images"
:src=
"src"
:key=
"src"
>
</viewer>
<el-dialog
custom-class=
'w400'
title=
"
提示
"
:visible
.
sync=
"finacialDialog"
center
>
<el-dialog
custom-class=
'w400'
title=
"
特殊驳回
"
:visible
.
sync=
"finacialDialog"
center
>
<
template
>
<el-input
type=
"textarea"
v-model=
"AuditOrRefundMsg.Description"
rows=
"3"
resize=
"none"
></el-input>
<div
class=
"FD_remark_list"
>
...
...
src/components/Ticketing/TicketAmiba.vue
View file @
5039061a
...
...
@@ -13,6 +13,10 @@
.TicketAmiba
.TA_GreenSale
{
color
:
green
;
}
.TA_TcNum
{
text-decoration
:
underline
;
cursor
:
pointer
;
}
</
style
>
<
template
>
...
...
@@ -47,20 +51,31 @@
<div
class=
"TA_Tongji"
>
<span>
总收入:
<span
class=
"TA_GreenSale"
>
{{
TotalSale
}}
</span></span>
<span>
总成本:
<span
class=
"TA_TotalCost"
>
{{
TotalCost
}}
</span></span>
<span>
散客机票利润:
<span
class=
"TA_GreenSale"
>
{{
TotalSK
}}
</span></span>
<span>
总利润:
<span
class=
"TA_GreenSale"
>
{{
TotalProfit
}}
</span></span>
</div>
<table
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
"loading"
style=
"margin-bottom:30px;"
>
<tr>
<th
width=
"20%"
>
团号
</th>
<th
width=
"20%"
>
成本
</th>
<th
width=
"20%"
>
收入
</th>
<th
width=
"20%"
>
利润
</th>
<th
width=
"20%"
>
业务员
</th>
<th
width=
"13%"
>
团号
</th>
<th
width=
"12%"
>
收入
</th>
<th
width=
"12%"
>
成本
</th>
<th
width=
"12%"
>
散客机票数量
</th>
<th
width=
"12%"
>
散客机票利润
</th>
<th
width=
"13%"
>
财务单据
</th>
<th
width=
"12%"
>
利润
</th>
<th
width=
"12%"
>
业务员
</th>
</tr>
<tr
v-for=
"(item,index) in dataList"
>
<td>
{{
item
.
TCNUM
}}
</td>
<td>
{{
item
.
CostPrice
}}
</td>
<td>
<span
class=
"TA_TcNum"
@
click=
"goAmoebaDetail(item.TCNUM,item.TCID)"
>
{{
item
.
TCNUM
}}
</span>
</td>
<td>
{{
item
.
SalePrice
}}
</td>
<td>
{{
item
.
CostPrice
}}
</td>
<td>
{{
item
.
IndividualTicketNum
}}
</td>
<td>
{{
item
.
IndividualTicketMoney
}}
</td>
<td>
<span></span>
</td>
<td>
{{
item
.
Profit
}}
</td>
<td>
{{
item
.
EmName
}}
</td>
</tr>
...
...
@@ -80,6 +95,8 @@
TotalSale
:
0
,
//总利润
TotalProfit
:
0
,
//散客机票利润
TotalSK
:
0
,
queryMsg
:
{
StartTime
:
''
,
EndTime
:
''
,
...
...
@@ -125,11 +142,27 @@
this
.
TotalCost
=
res
.
data
.
data
.
TotalCost
;
this
.
TotalSale
=
res
.
data
.
data
.
TotalSale
;
this
.
TotalProfit
=
res
.
data
.
data
.
TotalProfit
;
this
.
TotalSK
=
res
.
data
.
data
.
TotalSK
;
console
.
log
(
res
,
'resss'
);
console
.
log
(
this
.
dataList
,
'dalalist'
);
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
err
=>
{})
}
},
//跳转至阿米巴结算详情
goAmoebaDetail
(
TCNUM
,
TCID
){
this
.
$router
.
push
({
name
:
"AmoebaDetail"
,
query
:
{
TCNUM
:
TCNUM
,
TCID
:
TCID
,
blank
:
"y"
,
tab
:
"阿米巴结算详情"
}
});
},
}
}
</
script
>
src/components/TravelManager/TravelList/AmoebaDetail.vue
View file @
5039061a
...
...
@@ -38,7 +38,7 @@
<
template
>
<div
class=
"flexOne AmoebaDetail"
>
<div
class=
"AmoebaTitle"
>
<span
class=
"AmoebaTCNUM"
>
{{
LtName
}}
{{
TCNUM
}}
</span>
阿米巴结算表
<span
class=
"AmoebaTCNUM"
>
{{
TCNUM
}}
</span>
阿米巴结算表
</div>
<table
class=
"singeRowTable AmobaTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<tr>
...
...
@@ -69,7 +69,6 @@ export default {
msg
:
{
TCID
:
''
},
LtName
:
''
,
TCNUM
:
''
,
dataList
:
[],
};
...
...
@@ -96,7 +95,6 @@ export default {
},
mounted
()
{
this
.
LtName
=
this
.
$route
.
query
.
LtName
;
this
.
TCNUM
=
this
.
$route
.
query
.
TCNUM
;
this
.
msg
.
TCID
=
this
.
$route
.
query
.
TCID
;
this
.
getList
();
...
...
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
5039061a
...
...
@@ -1495,8 +1495,6 @@
<input
type=
"button"
class=
"normalBtn"
@
click=
"goTeamBalance(ConfigData.Config.TCID,ConfigData.Config.OutBranchId)"
value=
"团报"
/>
<input
type=
"button"
class=
"normalBtn"
@
click=
"goAmoebaDetail(ConfigData.Config.LtName,ConfigData.Config.TCNUM,ConfigData.Config.TCID)"
value=
"阿米巴结算表"
/>
<input
type=
"button"
class=
"normalBtn"
@
click=
"getOrderInfo()"
:value=
"'出团通知书('+(SetNoticeMsg.OutNotice==1?'OK':'暂定')+')'"
/>
<input
type=
"button"
@
click=
"CancelLeader"
v-if=
"ConfigData.Leader!=null&&ConfigData.Leader.LeaderId>0"
...
...
@@ -4775,19 +4773,6 @@
}
});
},
//跳转至阿米巴结算详情
goAmoebaDetail
(
LtName
,
TCNUM
,
TCID
){
this
.
$router
.
push
({
name
:
"AmoebaDetail"
,
query
:
{
LtName
:
LtName
,
TCNUM
:
TCNUM
,
TCID
:
TCID
,
blank
:
"y"
,
tab
:
"阿米巴结算详情"
}
});
},
//跳转到旅客名单
goToPassenger
(
item
)
{
this
.
$router
.
push
({
...
...
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @
5039061a
...
...
@@ -152,7 +152,11 @@
<div
class=
"flexOne TeamBalancePayment"
v-loading=
"loading"
>
<div
id=
"print"
>
<div
class=
"Team_Details"
>
<div
class=
"TB_comtitle"
>
团队收支明细
</div>
<div
class=
"TB_comtitle"
style=
"position:relative;"
>
<span>
团队收支明细
</span>
<input
type=
"button"
class=
"normalBtn"
style=
"position:absolute;right:100px;"
@
click=
"goAmoebaDetail(DataList.TeamBalance.TCNUM,TCID)"
value=
"阿米巴结算表"
/>
</div>
<div
class=
"Team_Content"
v-loading=
"loading"
>
<el-row
:gutter=
"12"
v-if=
"DataList&&DataList.TeamBalance"
>
<el-col
:span=
"4"
>
...
...
@@ -1450,6 +1454,18 @@
});
return
flag
;
},
//跳转至阿米巴结算详情
goAmoebaDetail
(
TCNUM
,
TCID
){
this
.
$router
.
push
({
name
:
"AmoebaDetail"
,
query
:
{
TCNUM
:
TCNUM
,
TCID
:
TCID
,
blank
:
"y"
,
tab
:
"阿米巴结算详情"
}
});
},
initZhuanMsg
()
{
this
.
zhuanMsg
=
{
NowTCNUM
:
''
,
...
...
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