!2769 添加功能

Merge pull request !2769 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2025-05-16 12:34:07 +00:00
committed by Gitee
+2 -2
View File
@@ -426,7 +426,7 @@ class HolidaysRequestBatch(models.Model):
start_time = first_hour_leave.request_hour_from
end_time = first_hour_leave.request_hour_to
hours = first_hour_leave.number_of_hours_text if first_hour_leave.number_of_hours_text else 0
title = f"{self.employee_id.name}的休假 {date_str},{start_time}-{end_time}"
title = f"{self.employee_id.name}的请假 {date_str},{start_time}~{end_time}"
if hours:
title += f",{hours}"
self.name = title
@@ -434,7 +434,7 @@ class HolidaysRequestBatch(models.Model):
# 只按天请假的情况
start_date_str = self.start_date.strftime('%Y-%m-%d')
end_date_str = self.end_date.strftime('%Y-%m-%d')
self.name = f"{self.employee_id.name}的请假 {start_date_str}-{end_date_str}"
self.name = f"{self.employee_id.name}的请假 {start_date_str}~{end_date_str}"
elif self.leave_ids and self.hour_leave_ids:
# 混合请假的情况
start_date_str = self.start_date.strftime('%Y-%m-%d')