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
b8f7a5ca
Commit
b8f7a5ca
authored
Mar 08, 2019
by
王悦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
营收报表签证
parent
52dafd84
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
73 additions
and
4 deletions
+73
-4
TeamRevenueReport.vue
...mponents/FinancialModule/ReportForm/TeamRevenueReport.vue
+25
-3
TeamBalancePayment.vue
...omponents/TravelManager/TravelList/TeamBalancePayment.vue
+48
-1
No files found.
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @
b8f7a5ca
...
...
@@ -496,6 +496,16 @@ tr._item_list td:last-child {
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
label=
"数据类别:"
>
<el-select
v-model=
"msg.DataType"
filterable
class=
"w150"
>
<el-option
key=
"-1"
value=
"-1"
label=
"不限"
></el-option>
<el-option
key=
"0"
value=
"1"
label=
"团队营收"
></el-option>
<el-option
key=
"1"
value=
"2"
label=
"机票"
></el-option>
<el-option
key=
"2"
value=
"3"
label=
"签证"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<ul
class=
"clearfix"
>
...
...
@@ -570,7 +580,13 @@ import downloadExcelEasy from "../../../assets/utils/downloadExcelEasy";
import
{
setTimeout
}
from
"timers"
;
Vue
.
component
(
"TCIDJump"
,
{
// 团队跳转
template
:
`<span style="cursor: pointer" @click="goUrl('TeamBalancePayment',rowData.TCID)">{{rowData.TCID}}</span>`
,
template
:
`
<div >
<span style="cursor: pointer" v-if="rowData.DataType===1" @click="goUrl('TeamBalancePayment',rowData.TCID)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProduct',rowData.TCID)">{{rowData.TCID}}</span>
</div>
`
,
props
:
{
rowData
:
{
type
:
Object
...
...
@@ -588,7 +604,12 @@ Vue.component("TCIDJump", {
path
:
"/"
+
path
,
query
:
{
id
:
id
,
blank
:
"y"
}
});
}
},
goUrlVisa
(
path
,
id
)
{
this
.
$router
.
push
({
path
:
"/"
+
path
,
query
:
{
VisaID
:
id
,
blank
:
"y"
}
});
},
}
});
Vue
.
component
(
"TCNUMJump"
,
{
...
...
@@ -662,6 +683,7 @@ export default {
endDate
:
""
,
Type
:
1
,
QueryCondition
:
"-1"
,
DataType
:
"-1"
},
getCompanyMsg
:
{
// 公司
...
...
@@ -730,7 +752,7 @@ export default {
{
field
:
"LineName"
,
title
:
"线路"
,
width
:
8
0
,
width
:
12
0
,
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
,
...
...
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @
b8f7a5ca
...
...
@@ -793,6 +793,53 @@
</tr>
</
template
>
</table>
<div
class=
"clearfix TB_PrintDiv"
>
<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 DataList.FinicePayList"
>
<tr
v-if=
"item.OrderSource===11 || isExists(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>
</div>
...
...
@@ -808,7 +855,7 @@
<th
width=
"200"
>
当前审核人
</th>
</tr>
<
template
v-for=
"item in DataList.FinicePayList"
>
<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,'导游佣金') &&item.OrderSource!==4"
>
<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,'导游佣金') &&item.OrderSource!==4
&& item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿')
"
>
<td>
<el-checkbox
v-model=
"item.checked"
></el-checkbox>
<span
class=
"Team_income"
@
click=
"goUrl('FinancialDocumentsDetail',item.FrID)"
>
{{
item
.
FrID
}}
</span>
...
...
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