From 39558b2d97a18c0766feaaaafa57763abb069251 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Fri, 13 Jun 2025 16:49:31 +0800
Subject: [PATCH] =?UTF-8?q?refactor(my=5Fattendance):=20=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E8=80=83=E5=8B=A4=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E9=80=BB?=
=?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
-整合左侧和右侧内容，提高信息密度
- 优化时间显示逻辑，区分考勤和请假情况
- 添加签退按钮，便于快速操作
- 修复部分字段空值显示问题
---
pages/common/my_attendance.vue | 68 ++++++++++++++--------------------
1 file changed, 28 insertions(+), 40 deletions(-)
diff --git a/pages/common/my_attendance.vue b/pages/common/my_attendance.vue
index cf71e4b..7bf632c 100644
--- a/pages/common/my_attendance.vue
+++ b/pages/common/my_attendance.vue
@@ -73,39 +73,33 @@
v-for="(v,k) in tableList"
:key="k"
>
-
+
普通考勤
{{v.status_name}}
- 校区：{{v.campus_id_name}}
+ 校区：{{v.campus_id_name || ''}}
备注：{{v.remarks || ''}}
- {{v.attendance_date}} {{v.check_in_time}}
- -
- {{v.attendance_date}} {{v.check_out_time}}
+
+
+ 开始时间：{{ v.attendance_date }} {{ v.check_in_time || '' }}
+ 结束时间：{{ v.attendance_date }} {{ v.check_out_time || '' }}
+
+
+
+
+ 开始时间：{{ v.attendance_date }} {{v.leave_start_time || ''}}
+ 结束时间：{{ v.attendance_date }} {{v.leave_end_time || ''}}
+
- 普通考勤
-
- {{v.status_name}}
-
-
- 校区：{{v.campus_id_name}}
-
-
- 备注：{{v.remarks || ''}}
-
-
- {{v.attendance_date}} {{v.check_in_time}}
- -
- {{v.attendance_date}} {{v.check_out_time}}
-
+ 签退
@@ -125,39 +119,33 @@
v-for="(v,k) in tableList"
:key="k"
>
-
+
普通考勤
{{v.status_name}}
- 校区：{{v.campus_id_name}}
+ 校区：{{v.campus_id_name || ''}}
备注：{{v.remarks || ''}}
- {{v.attendance_date}} {{v.check_in_time}}
- -
- {{v.attendance_date}} {{v.check_out_time}}
+
+
+ 开始时间：{{ v.attendance_date }} {{ v.check_in_time || '' }}
+ 结束时间：{{ v.attendance_date }} {{ v.check_out_time || '' }}
+
+
+
+
+ 开始时间：{{ v.attendance_date }} {{v.leave_start_time || ''}}
+ 结束时间：{{ v.attendance_date }} {{v.leave_end_time || ''}}
+
- 普通考勤
-
- {{v.status_name}}
-
-
- 校区：{{v.campus_id_name}}
-
-
- 备注：{{v.remarks || ''}}
-
-
- {{v.attendance_date}} {{v.check_in_time}}
- -
- {{v.attendance_date}} {{v.check_out_time}}
-
+ 签退