diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py index 83c95a8d9..334cfa813 100644 --- a/yuthon_holiday/models/inherit_hr_leave.py +++ b/yuthon_holiday/models/inherit_hr_leave.py @@ -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')