Commit e4f62653 authored by huanghaoting's avatar huanghaoting

对加班列表和加班申请进行修改

parent ff88548f
...@@ -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({
......
...@@ -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"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment