Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
attendance-performance-manager-ui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
attendance-performance-manager-ui
Commits
7d2b7e4c
Commit
7d2b7e4c
authored
Jun 04, 2024
by
姬鋆屾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
推修改每日打卡记录搜索条件及打卡结果状态颜色显示;修改考勤组查询名字失效得问题
parent
92150ebe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
14 deletions
+24
-14
src/views/attendance/group/list.vue
src/views/attendance/group/list.vue
+1
-1
src/views/attendance/record/list.vue
src/views/attendance/record/list.vue
+23
-13
No files found.
src/views/attendance/group/list.vue
View file @
7d2b7e4c
...
@@ -84,7 +84,7 @@ export default {
...
@@ -84,7 +84,7 @@ export default {
isshowTabPane
:
true
,
isshowTabPane
:
true
,
search
:
[
search
:
[
{
{
name
:
"
staff
Name
"
,
name
:
"
group
Name
"
,
type
:
"
text
"
,
type
:
"
text
"
,
label
:
"
考勤组名称
"
,
label
:
"
考勤组名称
"
,
fuzzy
:
true
,
fuzzy
:
true
,
...
...
src/views/attendance/record/list.vue
View file @
7d2b7e4c
...
@@ -325,7 +325,17 @@ export default {
...
@@ -325,7 +325,17 @@ export default {
property
===
"
offWorkResult
"
property
===
"
offWorkResult
"
)
{
)
{
let
val
=
arr
[
index
][
property
];
let
val
=
arr
[
index
][
property
];
return
this
.
tableData
.
dict
.
goWorkResult
[
val
];
return
this
.
tableData
.
dict
.
goWorkResult
[
val
]
==
"
正常
"
?
(
<
span
>
{
this
.
tableData
.
dict
.
goWorkResult
[
val
]}
<
/span
>
)
:
this
.
tableData
.
dict
.
goWorkResult
[
val
]
==
"
请假
"
?
(
<
span
style
=
"
color:#1a7af8
"
>
{
this
.
tableData
.
dict
.
goWorkResult
[
val
]}
<
/span
>
)
:
(
<
span
style
=
"
color:red
"
>
{
this
.
tableData
.
dict
.
goWorkResult
[
val
]}
<
/span
>
);
}
}
}
else
{
}
else
{
return
"
-
"
;
return
"
-
"
;
...
@@ -579,12 +589,12 @@ export default {
...
@@ -579,12 +589,12 @@ export default {
// label: "员工工号",
// label: "员工工号",
// fuzzy: true,
// fuzzy: true,
// },
// },
{
//
{
name
:
"
phone
"
,
//
name: "phone",
type
:
"
text
"
,
//
type: "text",
label
:
"
手机号
"
,
//
label: "手机号",
fuzzy
:
true
,
//
fuzzy: true,
},
//
},
{
{
name
:
"
deptId
"
,
name
:
"
deptId
"
,
type
:
"
select
"
,
type
:
"
select
"
,
...
@@ -603,12 +613,12 @@ export default {
...
@@ -603,12 +613,12 @@ export default {
label
:
"
班次
"
,
label
:
"
班次
"
,
fuzzy
:
false
,
fuzzy
:
false
,
},
},
{
//
{
name
:
"
punchResult
"
,
//
name: "punchResult",
type
:
"
select
"
,
//
type: "select",
label
:
"
打卡结果
"
,
//
label: "打卡结果",
fuzzy
:
false
,
//
fuzzy: false,
},
//
},
{
{
name
:
"
attendanceDateStart
"
,
name
:
"
attendanceDateStart
"
,
type
:
"
date
"
,
type
:
"
date
"
,
...
...
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