From 1c3f26f26ea1d9a41c07bf3c60f60978007c99c2 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Thu, 14 Aug 2025 18:13:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yuthon_hr_attendance/controllers/applet_attendance.py | 8 ++++----
yuthon_hr_attendance/views/overtime_approval.xml | 4 +---
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/yuthon_hr_attendance/controllers/applet_attendance.py b/yuthon_hr_attendance/controllers/applet_attendance.py
index 1c7781e8e..15df611bf 100644
--- a/yuthon_hr_attendance/controllers/applet_attendance.py
+++ b/yuthon_hr_attendance/controllers/applet_attendance.py
@@ -138,10 +138,10 @@ class AppletAttendance(Controller):
state = 'yes'
break
_logger.info(f"\n人员: {employee_id.name} {employee_id.company_id.name} \n当前所在地址: {self_address['formatted_address']} \n是否可以打卡: {state}\n {wifi_name_list}\n wifi:{kw['wifi_name']}_________")
- if self.is_workday(current_date):
- attendance_id_class = f"{attendance_id.shift_name} {start_time_str}-{end_time_str}"
- else:
- attendance_id_class = f"{attendance_id.shift_name}休息"
+ shift_info = attendance_id.shift_name if attendance_id else (
+ "行政班次" if self.is_workday(current_date) else "")
+ time_part = f"{start_time_str}-{end_time_str}" if self.is_workday(current_date) else "休息"
+ attendance_id_class = f"{shift_info}{time_part}" if shift_info else time_part
data = {
'location': self_address['formatted_address'],
'user_id': user_id.id,
diff --git a/yuthon_hr_attendance/views/overtime_approval.xml b/yuthon_hr_attendance/views/overtime_approval.xml
index c544685cb..cc183bbf8 100644
--- a/yuthon_hr_attendance/views/overtime_approval.xml
+++ b/yuthon_hr_attendance/views/overtime_approval.xml
@@ -58,7 +58,7 @@
-
+
@@ -72,8 +72,6 @@
-
-