From a69996480207604766c757eef7f11842adb82be3 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Tue, 27 May 2025 15:05:43 +0800
Subject: [PATCH] =?UTF-8?q?feat(common):=20=E6=96=B0=E5=A2=9E=E8=AF=B7?=
=?UTF-8?q?=E5=81=87=E3=80=81=E6=89=93=E5=8D=A1=E3=80=81=E7=AD=BE=E9=80=80?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 添加了请假、打卡、签退相关的 API 接口
- 实现了请假、打卡、签退的前端逻辑和界面
- 增加了用户信息获取和校区选择功能
- 优化了考勤列表的展示方式
---
api/apiRoute.js | 14 +
pages/common/my_attendance.vue | 495 ++++++++++++++++++++++++---------
2 files changed, 382 insertions(+), 127 deletions(-)
diff --git a/api/apiRoute.js b/api/apiRoute.js
index 1addf2f..76f946b 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -38,6 +38,20 @@ export default {
return res;
})
},
+ //教师/销售端请假/打卡/签退-编辑
+ common_attendanceEdit(data = {}) {
+ let url = '/attendance/edit'
+ return http.post(url, data).then(res => {
+ return res;
+ })
+ },
+ //教师/销售端请假/打卡/签退-列表
+ common_attendanceIndex(data = {}) {
+ let url = '/attendance/index'
+ return http.post(url, data).then(res => {
+ return res;
+ })
+ },
//获取字典数据
common_Dictionary(data = {}) {
let url = '/common/getDictionary'
diff --git a/pages/common/my_attendance.vue b/pages/common/my_attendance.vue
index fe56e8d..25468fd 100644
--- a/pages/common/my_attendance.vue
+++ b/pages/common/my_attendance.vue
@@ -3,7 +3,7 @@
-
-
-
+
-
+
- {{v.courses.name}}
+ 普通考勤
- {{v.status == 1 ? '考勤正常':'请假'}}
-
+ {{v.status_name}}
- {{v.add_time}} - {{v.end_time}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{v.courses.name}}
- {{v.status == 1 ? '考勤正常':'请假'}}
-
+ 校区：{{v.campus_id_name}}
- {{v.add_time}} - {{v.end_time}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{v.courses.name}}
- {{v.status == 1 ? '考勤正常':'请假'}}
-
+ 备注：{{v.remarks || ''}}
- {{v.add_time}} - {{v.end_time}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 普通考勤
- {{v.status == 1 ? '考勤正常':'请假'}}
+ {{v.attendance_date}} {{v.check_in_time}}
+ -
+ {{v.attendance_date}} {{v.check_out_time}}
- {{v.add_time}} - {{v.end_time}}
@@ -136,7 +54,7 @@
普通考勤
- {{v.status == 1 ? '考勤正常':'请假'}}
+ {{v.status_name}}
+
+
+ 校区：{{v.campus_id_name}}
+
+
+ 备注：{{v.remarks || ''}}
+
+
+ {{v.attendance_date}} {{v.check_in_time}}
+ -
+ {{v.attendance_date}} {{v.check_out_time}}
- {{v.add_time}} - {{v.end_time}}
-
普通考勤
- {{v.status == 1 ? '考勤正常':'请假'}}
+ {{v.status_name}}
+
+
+ 校区：{{v.campus_id_name}}
+
+
+ 备注：{{v.remarks || ''}}
+
+
+ {{v.attendance_date}} {{v.check_in_time}}
+ -
+ {{v.attendance_date}} {{v.check_out_time}}
- {{v.add_time}} - {{v.end_time}}
@@ -192,19 +129,100 @@
-
+
- 请假
+
+ 打卡
+
+
+ 请假
+
+
+ 签退
-
-
+
+
+ {{signIn_title}}
+ {{signIn_content}}
+
+
+
+
+
+
+ {{ (formData.campus_id) ? formData.campus_id_name : '点击选择' }}
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+