From 40bdddd8425484e8c34878a71200eef88f56999e 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: Mon, 20 Oct 2025 15:41: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

---
 .../models/overtime_approval.py               |  4 +-
 .../views/overtime_approval.xml               | 44 +++++++++----------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/yuthon_hr_attendance/models/overtime_approval.py b/yuthon_hr_attendance/models/overtime_approval.py
index 8ffb3f572..da75d4dca 100644
--- a/yuthon_hr_attendance/models/overtime_approval.py
+++ b/yuthon_hr_attendance/models/overtime_approval.py
@@ -34,8 +34,8 @@ class OvertimeApprovals(models.Model):
     attendance_id = fields.Many2one('hr.attendance', string="当天考勤")
     start_week = fields.Char(string="星期", compute='_compute_weekday')
     end_time = fields.Datetime(string="结束时间")
-    rest_start_time = fields.Datetime(string="开始时间")
-    rest_end_time = fields.Datetime(string="结束时间")
+    rest_start_time = fields.Datetime(string="休息开始时间")
+    rest_end_time = fields.Datetime(string="休息结束时间")
     end_week = fields.Char(string="星期", compute='_compute_weekday')
     type_overtime = fields.Selection([('work', '工作日加班'), ('weekend', '周末加班'), ('holiday', '节假日加班')],
                                      string="加班类型", compute="_compute_overtime_type", store=True)
diff --git a/yuthon_hr_attendance/views/overtime_approval.xml b/yuthon_hr_attendance/views/overtime_approval.xml
index 998ecce87..2278c84b6 100644
--- a/yuthon_hr_attendance/views/overtime_approval.xml
+++ b/yuthon_hr_attendance/views/overtime_approval.xml
@@ -60,31 +60,29 @@
                         </group>
                         <group/>
                     </group>
-                    <group col="2">
-                        <group col="2" string="加班时间">
-                            <group>
-                                 <label for="start_time"/>
-                                <div class="d-inline-flex w-100">
-                                    <field name="start_time" string="开始日期" class="me-2"
-                                           style="max-width: 25rem !important;" required="1"/>
-                                    <field name="start_week" string=" " class="ms-2"
-                                           style="max-width: 5rem !important;"/>
-                                </div>
-                                <label for="end_time"/>
-                                <div class="d-inline-flex w-100">
-                                    <field name="end_time" string="结束日期" class="me-2"
-                                           style="max-width: 25rem !important;" required="1"/>
-                                    <field name="end_week" string=" " class="ms-2"
-                                           style="max-width: 5rem !important;"/>
-                                </div>
-                                <field name="type_overtime"/>
-                            </group>
-                        </group>
-                        <group string="休息时间">
-                            <field name="rest_start_time"/>
-                            <field name="rest_end_time"/>
+                    <group col="2" string="加班信息">
+                        <group>
+                             <label for="start_time"/>
+                            <div class="d-inline-flex w-100">
+                                <field name="start_time" class="me-2"
+                                       style="max-width: 25rem !important;" required="1"/>
+                                <field name="start_week" string=" " class="ms-2"
+                                       style="max-width: 5rem !important;"/>
+                            </div>
+                            <label for="end_time"/>
+                            <div class="d-inline-flex w-100">
+                                <field name="end_time" class="me-2"
+                                       style="max-width: 25rem !important;" required="1"/>
+                                <field name="end_week" string=" " class="ms-2"
+                                       style="max-width: 5rem !important;"/>
+                            </div>
                         </group>
                     </group>
+                    <group>
+                        <field name="rest_start_time"/>
+                        <field name="rest_end_time"/>
+                        <field name="type_overtime"/>
+                    </group>
                     <group col="2">
                         <group>
                             <field name="duration"/>