diff --git a/src/api/attendance/attendance.js b/src/api/attendance/attendance.js index 4f26f2f..b8a535c 100644 --- a/src/api/attendance/attendance.js +++ b/src/api/attendance/attendance.js @@ -52,4 +52,12 @@ export function listAttendanceByParams(query) { }) } +// 查询考勤记录详细 +export function getAttendanceDetail(id) { + return request({ + url: '/attendance/attendance/detail/list/' + id, + method: 'get' + }) +} + diff --git a/src/plugins/DateUtils.js b/src/plugins/DateUtils.js new file mode 100644 index 0000000..4e7ad3d --- /dev/null +++ b/src/plugins/DateUtils.js @@ -0,0 +1,15 @@ +export default{ + getCurrentMonthStartDates(currentDate) { + const firstDay = new Date(currentDate); + firstDay.setDate(1); + // 格式化日期为YYYY-MM-DD格式 + return firstDay.toISOString().slice(0, 10); + }, + + getCurrentMonthEndDates(currentDate) { + const lastDay = new Date(currentDate); + lastDay.setMonth(lastDay.getMonth() + 1, 0); // 设置日期为下个月的第一天的前一天,即当前月的最后一天 + // 格式化日期为YYYY-MM-DD格式 + return lastDay.toISOString().slice(0, 10); + } + } \ No newline at end of file diff --git a/src/views/attendance/attendance/index.vue b/src/views/attendance/attendance/index.vue index a804625..e7a2559 100644 --- a/src/views/attendance/attendance/index.vue +++ b/src/views/attendance/attendance/index.vue @@ -14,7 +14,8 @@ start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" - clearable> + :clearable="false" + > @@ -88,6 +89,12 @@ @click="handleUpdate(scope.row)" v-hasPermi="['attendance:attendance:edit']" >修改 + 打卡详情 @@ -177,14 +184,35 @@ 取 消 + + +
+ + + {{activity.content}} + + +
+