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
aea57ba6
Commit
aea57ba6
authored
5 years ago
by
黄媛媛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
57e264f2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
99 additions
and
7 deletions
+99
-7
TeamRevenueReport.vue
...mponents/FinancialModule/ReportForm/TeamRevenueReport.vue
+28
-3
TeamBalancePayment.vue
...omponents/TravelManager/TravelList/TeamBalancePayment.vue
+71
-4
No files found.
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @
aea57ba6
...
@@ -576,6 +576,14 @@ tr._item_list td:last-child {
...
@@ -576,6 +576,14 @@ tr._item_list td:last-child {
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
label=
"只看收据未制单:"
label-width=
"125px"
>
<el-select
v-model=
"msg.IsSelectReceipt"
filterable
class=
"w150"
>
<el-option
label=
"是"
:value=
"1"
></el-option>
<el-option
label=
"否"
:value=
"0"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"4"
v-if=
"userId==1 || userId==5 || F_GeneralManager"
>
<el-col
:span=
"4"
v-if=
"userId==1 || userId==5 || F_GeneralManager"
>
<el-button
@
click=
"msg.Is_Open=0,SetTravelClose()"
type=
"danger"
size=
"small"
round
:loading=
"btnloading"
>
开启团队收支
</el-button>
<el-button
@
click=
"msg.Is_Open=0,SetTravelClose()"
type=
"danger"
size=
"small"
round
:loading=
"btnloading"
>
开启团队收支
</el-button>
<el-button
@
click=
"msg.Is_Open=1,SetTravelClose()"
type=
"danger"
size=
"small"
round
:loading=
"btnloading"
>
关闭团队收支
</el-button>
<el-button
@
click=
"msg.Is_Open=1,SetTravelClose()"
type=
"danger"
size=
"small"
round
:loading=
"btnloading"
>
关闭团队收支
</el-button>
...
@@ -942,7 +950,8 @@ export default {
...
@@ -942,7 +950,8 @@ export default {
Is_Transport
:
'-1'
,
Is_Transport
:
'-1'
,
LeaderId
:
0
,
LeaderId
:
0
,
LeaderType
:
0
,
LeaderType
:
0
,
OutTCStatus
:
'0'
OutTCStatus
:
'0'
,
IsSelectReceipt
:
0
,
},
},
getCompanyMsg
:
{
getCompanyMsg
:
{
// 公司
// 公司
...
@@ -1737,6 +1746,22 @@ export default {
...
@@ -1737,6 +1746,22 @@ export default {
titleAlign
:
"left"
,
titleAlign
:
"left"
,
columnAlign
:
"right"
,
columnAlign
:
"right"
,
isResize
:
true
isResize
:
true
},
{
field
:
"ReceiptNotFinance"
,
title
:
"未制单收据"
,
width
:
60
,
titleAlign
:
"left"
,
columnAlign
:
"right"
,
isResize
:
true
},
{
field
:
"ReceiptNotAudit"
,
title
:
"制单未审核收据"
,
width
:
60
,
titleAlign
:
"left"
,
columnAlign
:
"right"
,
isResize
:
true
}
}
],
],
footer
:
[],
footer
:
[],
...
...
This diff is collapsed.
Click to expand it.
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @
aea57ba6
...
@@ -287,22 +287,22 @@
...
@@ -287,22 +287,22 @@
</div>
</div>
</div>
</div>
</el-col>
</el-col>
<
!-- <
el-col :span="3">
<el-col
:span=
"3"
>
<div
class=
"Team_DList"
>
<div
class=
"Team_DList"
>
<div
class=
"Team_firstTitle"
>
<div
class=
"Team_firstTitle"
>
<span
class=
"Team_comCoinType Team_shou"
>
<span
class=
"Team_comCoinType Team_shou"
>
<i
class=
"iconfont icon-qian"
></i>
<i
class=
"iconfont icon-qian"
></i>
</span>财务
单
据
</span>
财务
收
据
</div>
</div>
<div
class=
"Team_Incontent"
>
<div
class=
"Team_Incontent"
>
<div>
制单已审核:
<span>
¥{{moneyFormat(dataInfo.CXMoney)}}
</span></div>
<div>
制单已审核:
<span>
¥{{moneyFormat(dataInfo.CXMoney)}}
</span></div>
<div>
制单未审核:
<span
class=
"Team_Coins"
>
¥{{moneyFormat(dataInfo.ZDMoney)}}
</span></div>
<div>
制单未审核:
<span
class=
"Team_Coins"
>
¥{{moneyFormat(dataInfo.ZDMoney)}}
</span></div>
<div>未制单:<span class="Team_Coins">¥{{moneyFormat(dataInfo.Money)}}</span></div>
<div>
未制单
金额
:
<span
class=
"Team_Coins"
>
¥{{moneyFormat(dataInfo.Money)}}
</span></div>
<div>
<div>
</div>
</div>
</div>
</div>
</div>
</div>
</el-col>
-->
</el-col>
</el-row>
</el-row>
</div>
</div>
...
@@ -1410,6 +1410,52 @@
...
@@ -1410,6 +1410,52 @@
</tr>
</tr>
</
template
>
</
template
>
</table>
</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>
ID
</th>
<th>
团号
</th>
<th>
账户类型
</th>
<th>
账户名称
</th>
<th>
财务单据
</th>
<th>
单据状态
</th>
<th>
是否审核
</th>
<th>
收据金额
</th>
<th>
汇率
</th>
<th>
原币
</th>
<th>
收据日期
</th>
<th>
操作人/时间
</th>
<th>
备注
</th>
</tr>
<
template
v-for=
"(item,i) in dataDocList"
>
<tr
:key=
"i"
>
<td>
{{
item
.
Id
}}
</td>
<td>
{{
item
.
TCNUM
}}
(
{{
item
.
TCID
}}
)
</td>
<td>
<span
v-if=
"item.Type==1"
>
银行
</span>
<span
v-if=
"item.Type==2"
>
平台
</span>
<span
v-if=
"item.Type==3"
>
现金
</span>
<span
v-if=
"item.Type==4"
>
资金池
</span>
</td>
<td>
{{
item
.
AccountName
}}
</td>
<td>
{{
item
.
FinanceId
}}
</td>
<td>
{{
item
.
fStatusName
}}
</td>
<td>
<span
v-if=
"item.Is_Cashier==1"
>
是
</span>
<span
v-if=
"item.Is_Cashier==0"
>
否
</span>
</td>
<td>
{{
item
.
Money
}}
</td>
<td>
{{
item
.
Rate
}}
</td>
<td>
{{
item
.
WBMoney
}}
</td>
<td>
{{
item
.
Time
}}
</td>
<td>
{{
item
.
UpdateBy
}}
/
{{
item
.
UpdateDate
}}
</td>
<td>
{{
item
.
Remark
}}
</td>
</tr>
</
template
>
</table>
</div>
</div>
</div>
</div>
<div
class=
"Team_BtnList"
v-if=
"IsHaveAuth"
>
<div
class=
"Team_BtnList"
v-if=
"IsHaveAuth"
>
...
@@ -1572,9 +1618,29 @@
...
@@ -1572,9 +1618,29 @@
StartTime
:
''
,
StartTime
:
''
,
EndTime
:
''
,
EndTime
:
''
,
},
},
dataDocList
:[],
};
};
},
},
methods
:
{
methods
:
{
getDocList
(){
let
obj
=
{
pageIndex
:
1
,
pageSize
:
999
,
TCNUM
:
this
.
TCID
,
FinanceId
:
0
,
AccountId
:
-
1
,
Type
:
3
,
StartTime
:
''
,
EndTime
:
''
,
};
this
.
apipost
(
'Financial_get_GetFinanceReceiptPageList'
,
obj
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
this
.
dataDocList
=
res
.
data
.
data
.
pageData
;
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
);
}
},
err
=>
{})
},
getdataInfo
(){
getdataInfo
(){
if
(
this
.
dateList
&&
this
.
dateList
.
length
>
0
){
if
(
this
.
dateList
&&
this
.
dateList
.
length
>
0
){
this
.
datainfoobj
.
StartTime
=
this
.
dateList
[
0
];
this
.
datainfoobj
.
StartTime
=
this
.
dateList
[
0
];
...
@@ -2128,6 +2194,7 @@ this.moneyAll.otheryTotalsf+=item.PayMoney;
...
@@ -2128,6 +2194,7 @@ this.moneyAll.otheryTotalsf+=item.PayMoney;
this
.
checkHasAuth
();
this
.
checkHasAuth
();
this
.
getList
();
this
.
getList
();
this
.
getdataInfo
();
this
.
getdataInfo
();
this
.
getDocList
();
}
}
};
};
...
...
This diff is collapsed.
Click to expand it.
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