From 741d6ba46d71ceceeaf1af390ca4fcf84c28cc58 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: Wed, 25 Feb 2026 02:15:48 +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/models/yuthon_vacation_reports.py | 1 + yuthon_hr_employee/views/yuthon_hr_employee_views.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py index f5215e3f9..c8d2b5509 100644 --- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py +++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py @@ -721,6 +721,7 @@ class YuthonVacationReports(models.Model): regular_days = 0 # 转正天数 actual_attendance = 0 # 实到天数 = 应到天数 - 请假总天数 - 异常天数 leave_total_days = 0 # 累计请假天数 + test_days = 0 is_retired = rec.employee_id.user_state in ('leave', 'withdraw') if rec.employee_id and rec.vacation_date and not is_retired: year = rec.vacation_date.year diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml index 4f4a1d5b0..f01539413 100644 --- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml +++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml @@ -629,7 +629,7 @@ + domain="[('end_comparison', 'in', ['red', 'yellow', 'blue'])]" shownumber="1"/>