From 1f829032230eaab4d8650a3b9fc207e0d22644ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Fri, 14 Aug 2026 18:39:37 +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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yuthon_hr_attendance/controllers/applet_attendance.py b/yuthon_hr_attendance/controllers/applet_attendance.py index d16289b27..9cff7eb8b 100644 --- a/yuthon_hr_attendance/controllers/applet_attendance.py +++ b/yuthon_hr_attendance/controllers/applet_attendance.py @@ -178,7 +178,7 @@ class AppletAttendance(Controller): check_in_str = check_in.strftime('%H:%M:%S') if check_in else ' ' check_out_str = check_out.strftime('%H:%M:%S') if check_out else ' ' has_leave_batch_workflow = False - if attendance_id.workflow_id and attendance_id.workflow_id.res_model in ['hr.leave.batch', 'go.approval']: + if attendance_id.workflow_id and attendance_id.workflow_id.res_model in ['hr.leave.batch', 'go.approval', 'card.approval']: has_leave_batch_workflow = True check_in_html = f'

{check_in_str}

' if (has_leave_batch_workflow or shift_name == '外派') else ( @@ -778,13 +778,13 @@ class AppletAttendance(Controller): has_leave_batch_workflow = False if hasattr(att, 'workflow_id') and att.workflow_id: - if att.workflow_id.res_model in ['hr.leave.batch', 'go.approval']: + if att.workflow_id.res_model in ['hr.leave.batch', 'go.approval', 'card.approval']: has_leave_batch_workflow = True if not check_in_status and not check_out_status: color_select = 3 else: - if has_leave_batch_workflow or is_rest_shift: + if has_leave_batch_workflow or is_rest_shift or att.shift_name == '外派': color_select = 1 else: has_exception = (check_in_status in ['迟到', '早退', '缺卡', '旷工']) or (