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
3cc12738
Commit
3cc12738
authored
Dec 08, 2022
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
8a998dcc
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
JumpReport.vue
src/components/FinancialModule/JumpReport.vue
+1
-1
EasyReport.vue
src/components/FinancialModule/ReportForm/EasyReport.vue
+7
-6
TeamRevenueReport.vue
...mponents/FinancialModule/ReportForm/TeamRevenueReport.vue
+1
-2
No files found.
src/components/FinancialModule/JumpReport.vue
View file @
3cc12738
...
...
@@ -925,7 +925,7 @@ export default {
this
.
coinGetList
=
res
.
data
.
data
;
if
(
this
.
msg
.
RB_Branch_Id
==
-
1
){
this
.
coinGetShow
=
false
this
.
msg
.
StandardCurrencyId
=
this
.
coinGetList
[
0
].
ID
this
.
msg
.
StandardCurrencyId
=
this
.
$route
.
query
.
StandardCurrencyId
?
Number
(
this
.
$route
.
query
.
StandardCurrencyId
):
this
.
coinGetList
[
0
].
ID
;
}
else
{
this
.
coinGetShow
=
true
this
.
msg
.
StandardCurrencyId
=
-
1
...
...
src/components/FinancialModule/ReportForm/EasyReport.vue
View file @
3cc12738
...
...
@@ -874,7 +874,7 @@ export default {
this
.
$router
.
push
({
name
:
path
,
query
:{
"startDate"
:
startDate
,
"endDate"
:
endDate
,
BranchId
:
BranchId
,
blank
:
'y'
,
tab
:
tab
}
})
},
GoUrlFan
(
path
,
month
,
year
,
BranchId
,
ids
)
{
GoUrlFan
(
path
,
month
,
year
,
BranchId
,
ids
,
StandardCurrencyId
)
{
this
.
$router
.
push
({
path
:
"/"
+
path
,
query
:
{
...
...
@@ -882,6 +882,7 @@ export default {
month
:
month
,
BranchId
:
BranchId
,
CostIds
:
ids
,
StandardCurrencyId
:
StandardCurrencyId
,
blank
:
"y"
}
});
...
...
@@ -905,7 +906,7 @@ export default {
if
(
rowIndex
<
15
){
if
(
BranchId
==
1245
){
that
.
$router
.
push
({
name
:
"TeamRevenueReport"
,
query
:{
"StartTime"
:
startDate
,
"EndTime"
:
endDate
,
BranchId
:
BranchId
,
StandardCurrencyId
,
blank
:
'y'
,
tab
:
"营收报表"
}
})
that
.
$router
.
push
({
name
:
"TeamRevenueReport"
,
query
:{
"StartTime"
:
startDate
,
"EndTime"
:
endDate
,
BranchId
:
BranchId
,
OutBranchId
:
BranchId
,
StandardCurrencyId
,
blank
:
'y'
,
tab
:
"营收报表"
}
})
}
else
if
(
rowData
.
ZhaiYao
==
"联运收入"
){
that
.
goUrl
(
"CombinedRevenueReport"
,
startDate
,
endDate
,
BranchId
,
"联运收入"
)
}
...
...
@@ -917,7 +918,7 @@ export default {
that
.
goUrl
(
"RecPayQueryTeamV2"
,
startDate
,
endDate
,
BranchId
,
"应付团款查询"
)
}
else
{
that
.
$router
.
push
({
name
:
"TeamRevenueReport"
,
query
:{
"StartTime"
:
startDate
,
"EndTime"
:
endDate
,
BranchId
:
BranchId
,
StandardCurrencyId
,
blank
:
'y'
,
tab
:
"营收报表"
}
})
that
.
$router
.
push
({
name
:
"TeamRevenueReport"
,
query
:{
"StartTime"
:
startDate
,
"EndTime"
:
endDate
,
BranchId
:
BranchId
,
OutBranchId
:
BranchId
,
StandardCurrencyId
,
blank
:
'y'
,
tab
:
"营收报表"
}
})
}
}
else
{
if
(
rowData
.
ZhaiYao
==
"员工提成"
){
...
...
@@ -962,13 +963,13 @@ export default {
month
:
month
,
BranchId
:
rowData
.
BranchId
,
CostIds
:
rowData
.
CostIds
,
StandardCurrencyId
,
StandardCurrencyId
:
StandardCurrencyId
,
"IsJapanNonbusinessIncome"
:
1
,
blank
:
"y"
}
});
}
else
{
that
.
GoUrlFan
(
'JumpReport'
,
month
,
rowData
.
Year
,
rowData
.
BranchId
,
rowData
.
CostIds
)
that
.
GoUrlFan
(
'JumpReport'
,
month
,
rowData
.
Year
,
rowData
.
BranchId
,
rowData
.
CostIds
,
StandardCurrencyId
)
}
...
...
@@ -990,7 +991,7 @@ export default {
}
}
else
{
that
.
GoUrlFan
(
'JumpReport'
,
month
,
rowData
.
Year
,
rowData
.
BranchId
,
rowData
.
CostIds
)
that
.
GoUrlFan
(
'JumpReport'
,
month
,
rowData
.
Year
,
rowData
.
BranchId
,
rowData
.
CostIds
,
StandardCurrencyId
)
}
}
...
...
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @
3cc12738
...
...
@@ -1853,7 +1853,6 @@ export default {
this
.
msg
.
endDate
=
this
.
$route
.
query
.
EndTime
!=
undefined
?
this
.
$route
.
query
.
EndTime
:
''
;
this
.
msg
.
LineId
=
this
.
$route
.
query
.
LineId
!=
undefined
?
Number
(
this
.
$route
.
query
.
LineId
):
''
;
this
.
msg
.
OutBranchId
=
this
.
$route
.
query
.
OutBranchId
?
Number
(
this
.
$route
.
query
.
OutBranchId
):
this
.
msg
.
OutBranchId
;
this
.
msg
.
StandardCurrencyId
=
this
.
$route
.
query
.
StandardCurrencyId
if
(
this
.
$route
.
query
.
LtIdStr
){
this
.
msg
.
LtIdStr
=
this
.
$route
.
query
.
LtIdStr
}
...
...
@@ -1961,7 +1960,7 @@ export default {
this
.
coinGetList
=
res
.
data
.
data
;
if
(
this
.
msg
.
OutBranchId
==
-
1
){
this
.
coinGetShow
=
false
this
.
msg
.
StandardCurrencyId
=
this
.
coinGetList
[
0
].
ID
this
.
msg
.
StandardCurrencyId
=
this
.
$route
.
query
.
StandardCurrencyId
?
Number
(
this
.
$route
.
query
.
StandardCurrencyId
):
this
.
coinGetList
[
0
].
ID
;
}
else
{
this
.
coinGetShow
=
true
this
.
msg
.
StandardCurrencyId
=
-
1
...
...
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