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
14e1efc5
Commit
14e1efc5
authored
May 20, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改考核统计bug
parent
90487594
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
9 deletions
+15
-9
ChoiceAddFinancialDocuments2.vue
...mponents/FinancialModule/ChoiceAddFinancialDocuments2.vue
+4
-4
leaderReimbursement.vue
src/components/LeaderManagement/leaderReimbursement.vue
+6
-1
ExaminationStatistics.vue
src/components/administrative/ExaminationStatistics.vue
+5
-4
No files found.
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @
14e1efc5
...
...
@@ -175,11 +175,11 @@
x
.
bigShow
=
false
}
}
else
if
(
x
.
Id
===
48
)
{
if
(
this
.
EmployeeId
===
1725
)
{
//
if (this.EmployeeId === 1725) {
x
.
bigShow
=
true
}
else
{
x
.
bigShow
=
false
}
//
} else {
//
x.bigShow = false
//
}
}
}
else
{
x
.
bigShow
=
true
...
...
src/components/LeaderManagement/leaderReimbursement.vue
View file @
14e1efc5
...
...
@@ -558,7 +558,12 @@
Money
:
obj
.
LeaderGetPriceT
,
TCNUMS
:
obj
.
TCNUMS
}
let
id
=
[
43
,
48
]
let
id
=
[];
if
(
obj
.
OutBranchId
===
0
)
{
id
=
[
43
,
48
]
}
else
{
id
=
[
43
,
53
]
}
this
.
$router
.
push
({
name
:
'ChoiceAddFinancialDocuments'
,
query
:
{
...
...
src/components/administrative/ExaminationStatistics.vue
View file @
14e1efc5
...
...
@@ -111,15 +111,15 @@ export default {
data
=
data
.
filter
(
item
=>
item
.
bName
&&
item
.
bName
.
indexOf
(
filters
.
bName
)
!=-
1
);
}
if
(
filters
.
departmentName
&&
filters
.
departmentName
!=
''
){
data
=
data
.
filter
(
item
=>
item
.
departmentName
.
indexOf
(
filters
.
departmentName
)
!=-
1
);
data
=
data
.
filter
(
item
=>
item
.
departmentName
&&
item
.
departmentName
.
indexOf
(
filters
.
departmentName
)
!=-
1
);
}
if
(
filters
.
emName
&&
filters
.
emName
!=
''
){
data
=
data
.
filter
(
item
=>
item
.
emName
.
indexOf
(
filters
.
emName
)
!=-
1
);
}
if
(
filters
.
periods
&&
filters
.
periods
!=
''
&&
filters
.
periods
!=
'__all__'
){
if
(
filters
.
periods
&&
filters
.
periods
!=
''
&&
filters
.
periods
!=
'__all__'
){
this
.
msg
.
Periods
=
filters
.
periods
this
.
getList
();
}
else
{
}
else
if
(
!
filters
.
bName
&&
filters
.
bName
===
''
&&
filters
.
bName
===
'__all__'
)
{
this
.
msg
.
Periods
=
''
this
.
getList
();
}
...
...
@@ -329,7 +329,7 @@ export default {
columnAlign
:
"left"
,
isResize
:
true
,
width
:
80
,
//
orderBy: "",
orderBy
:
""
,
formatter
:
function
(
rowData
,
rowIndex
,
pagingIndex
,
field
)
{
return
`<span>
${
rowData
.
appletOrderCount
<=
0
?
''
:
rowData
.
appletOrderCount
}
</span>`
}
...
...
@@ -395,6 +395,7 @@ export default {
this
.
msg
.
OrderBy
=
'a.LllegalModifyRemarkCount '
+
param
.
lllegalModifyRemarkCount
}
if
(
param
.
appletOrderCount
!=
''
){
this
.
msg
.
OrderBy
=
'a.AppletOrderCount '
+
param
.
appletOrderCount
}
//this.tableData = this.orderBy(d, ["incomeVal"], param.income).results;
...
...
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