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
2eed1c61
Commit
2eed1c61
authored
Sep 24, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
edc577d7
61a8ba61
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
119 additions
and
32 deletions
+119
-32
OPRules.vue
src/components/FinancialModule/OPRules.vue
+119
-27
EasyReport.vue
src/components/FinancialModule/ReportForm/EasyReport.vue
+0
-5
No files found.
src/components/FinancialModule/OPRules.vue
View file @
2eed1c61
This diff is collapsed.
Click to expand it.
src/components/FinancialModule/ReportForm/EasyReport.vue
View file @
2eed1c61
...
...
@@ -882,17 +882,12 @@ export default {
that
.
$router
.
push
({
name
:
"TeamRevenueReport"
,
query
:{
"StartTime"
:
startDate
,
"EndTime"
:
endDate
,
BranchId
:
BranchId
,
blank
:
'y'
,
tab
:
"营收报表"
}
})
}
}
else
{
console
.
log
(
"rowIndex"
,
rowIndex
)
console
.
log
(
"column"
,
column
)
console
.
log
(
"year"
,
this
.
year
)
console
.
log
(
"rowData"
,
rowData
);
if
(
rowData
.
ZhaiYao
==
"员工提成"
){
if
(
Number
(
this
.
year
)
==
2019
){
if
(
column
.
title
==
"七月"
||
column
.
title
==
"八月"
||
column
.
title
==
"九月"
||
column
.
title
==
"十月"
||
column
.
title
==
"十一月"
||
column
.
title
==
"十二月"
){
let
CostIds
=
""
;
CostIds
=
rowData
.
CostIds
.
replace
(
'112,'
,
''
);
console
.
log
(
"CostIds"
,
CostIds
)
that
.
GoUrlFan
(
'JumpReport'
,
month
,
rowData
.
Year
,
rowData
.
BranchId
,
CostIds
)
}
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