Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
psa-web
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
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
高滢
psa-web
Commits
e4f62653
Commit
e4f62653
authored
Mar 13, 2025
by
huanghaoting
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
对加班列表和加班申请进行修改
parent
ff88548f
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
168 additions
and
198 deletions
+168
-198
overtimeApplication.js
src/api/application/overtimeApplication.js
+9
-0
add.vue
src/views/attendance/overtimeApplication/add.vue
+157
-196
index.vue
src/views/attendance/overtimeApplication/index.vue
+2
-2
No files found.
src/api/application/overtimeApplication.js
View file @
e4f62653
...
@@ -35,6 +35,15 @@ export function addOvertimeApplication(data) {
...
@@ -35,6 +35,15 @@ export function addOvertimeApplication(data) {
})
})
}
}
// 批量新增加班申请
export
function
addOvertimeApplications
(
data
)
{
return
request
({
url
:
'/application/overtimeApplication/batch'
,
method
:
'post'
,
data
:
data
})
}
// 修改加班申请
// 修改加班申请
export
function
updateOvertimeApplication
(
data
)
{
export
function
updateOvertimeApplication
(
data
)
{
return
request
({
return
request
({
...
...
src/views/attendance/overtimeApplication/add.vue
View file @
e4f62653
This diff is collapsed.
Click to expand it.
src/views/attendance/overtimeApplication/index.vue
View file @
e4f62653
...
@@ -108,7 +108,7 @@
...
@@ -108,7 +108,7 @@
<!--
<el-table-column
label=
"id号"
align=
"center"
prop=
"id"
/>
-->
<!--
<el-table-column
label=
"id号"
align=
"center"
prop=
"id"
/>
-->
<!--
<el-table-column
label=
"加班单号"
align=
"center"
prop=
"overtimeId"
width=
"150px"
/>
-->
<!--
<el-table-column
label=
"加班单号"
align=
"center"
prop=
"overtimeId"
width=
"150px"
/>
-->
<el-table-column
label=
"姓名"
align=
"center"
prop=
"uname"
/>
<el-table-column
label=
"姓名"
align=
"center"
prop=
"uname"
/>
<el-table-column
label=
"
申请
日期"
align=
"center"
prop=
"requestDate"
>
<el-table-column
label=
"
加班
日期"
align=
"center"
prop=
"requestDate"
>
<template
#
default=
"scope"
>
<template
#
default=
"scope"
>
<span>
{{
parseTime
(
scope
.
row
.
requestDate
,
'{y
}
-{m
}
-{d
}
'
)
}}
<
/span
>
<span>
{{
parseTime
(
scope
.
row
.
requestDate
,
'{y
}
-{m
}
-{d
}
'
)
}}
<
/span
>
<
/template
>
<
/template
>
...
@@ -125,7 +125,7 @@
...
@@ -125,7 +125,7 @@
<!--
<
/template>--
>
<!--
<
/template>--
>
<!--
<
/el-table-column>--
>
<!--
<
/el-table-column>--
>
<!--
<
el
-
table
-
column
label
=
"星期"
align
=
"center"
prop
=
"dayOfWeek"
/>-->
<!--
<
el
-
table
-
column
label
=
"星期"
align
=
"center"
prop
=
"dayOfWeek"
/>-->
<
el
-
table
-
column
label
=
"加班时长"
align
=
"center"
prop
=
"overtimeHours"
/>
<
el
-
table
-
column
label
=
"加班时长
(小时)
"
align
=
"center"
prop
=
"overtimeHours"
/>
<!--
<
el
-
table
-
column
label
=
"加班天数"
align
=
"center"
prop
=
"overtimeDays"
/>-->
<!--
<
el
-
table
-
column
label
=
"加班天数"
align
=
"center"
prop
=
"overtimeDays"
/>-->
<
el
-
table
-
column
label
=
"归属项目"
align
=
"center"
prop
=
"project"
/>
<
el
-
table
-
column
label
=
"归属项目"
align
=
"center"
prop
=
"project"
/>
<
el
-
table
-
column
label
=
"项目负责人"
align
=
"center"
prop
=
"projectLeader"
/>
<
el
-
table
-
column
label
=
"项目负责人"
align
=
"center"
prop
=
"projectLeader"
/>
...
...
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