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
cd8001d6
Commit
cd8001d6
authored
Aug 14, 2024
by
姬鋆屾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed:提交考勤汇总按月导出,不能跨月导出考勤数据
parent
46afead9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
13 deletions
+23
-13
src/components/SearchForm.vue
src/components/SearchForm.vue
+5
-0
src/views/attendance/stat/list.vue
src/views/attendance/stat/list.vue
+18
-13
No files found.
src/components/SearchForm.vue
View file @
cd8001d6
...
...
@@ -509,7 +509,12 @@ export default {
if
(
this
.
$route
.
name
==
"
attendance/stat/list
"
)
{
if
(
this
.
form
.
summaryTimeStart
&&
this
.
form
.
summaryTimeEnd
)
{
this
.
form
.
summaryTimeStart
=
this
.
form
.
summaryTimeStart
+
"
-01
"
;
let
startValue
=
Date
.
parse
(
this
.
form
.
summaryTimeStart
);
this
.
form
.
summaryTimeEnd
=
this
.
form
.
summaryTimeStart
.
replace
(
"
-01
"
,
"
-31
"
);
let
endValue
=
Date
.
parse
(
this
.
form
.
summaryTimeEnd
);
if
(
startValue
>
endValue
)
{
this
.
$message
.
error
(
"
查询-结束的日期需大于开始日期
"
);
...
...
src/views/attendance/stat/list.vue
View file @
cd8001d6
...
...
@@ -66,7 +66,7 @@
{{
item
.
label
}}
</el-checkbox>
</el-checkbox-group>
<div
class=
"mt20"
style=
"text-align:right"
>
<div
class=
"mt20"
style=
"text-align:
right"
>
<el-button
@
click=
"handleCancel(1)"
>
取消
</el-button>
<el-button
type=
"primary"
@
click=
"handleSubmit(1)"
>
确定
</el-button>
</div>
...
...
@@ -85,7 +85,7 @@
{{
item
.
label
}}
</el-checkbox>
</el-checkbox-group>
<div
class=
"mt20"
style=
"text-align:right"
>
<div
class=
"mt20"
style=
"text-align:
right"
>
<el-button
@
click=
"handleCancel(2)"
>
取消
</el-button>
<el-button
type=
"primary"
@
click=
"handleSubmit(2)"
>
确定
</el-button>
</div>
...
...
@@ -102,9 +102,7 @@
<div>
打卡记录汇总
</div>
<el-button
type=
"text"
>
导出成功
</el-button>
</div>
<div
class=
"times"
>
导出时间:2020-08-13
</div>
<div
class=
"times"
>
导出时间:2020-08-13
</div>
</div>
</div>
</el-drawer>
...
...
@@ -132,6 +130,7 @@ export default {
this
.
query
.
summaryTimeStart
=
getFirstDay
();
this
.
query
.
summaryTimeEnd
=
getLastDay
();
this
.
initalArr
=
this
.
config
.
columns
;
},
methods
:
{
// 表格设置弹窗取消操作
...
...
@@ -422,16 +421,22 @@ export default {
// },
{
name
:
"
summaryTimeStart
"
,
type
:
"
date
"
,
label
:
"
考勤开始时间
"
,
fuzzy
:
false
,
},
{
name
:
"
summaryTimeEnd
"
,
type
:
"
date
"
,
label
:
"
考勤结束时间
"
,
type
:
"
month
"
,
label
:
"
考勤时间
"
,
fuzzy
:
false
,
},
// {
// name: "summaryTimeStart",
// type: "date",
// label: "考勤开始时间",
// fuzzy: false,
//},
//{
// name: "summaryTimeEnd",
// type: "date",
// label: "考勤结束时间",
// fuzzy: false,
// },
{
name
:
"
staffName
"
,
type
:
"
text
"
,
...
...
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