From c31b0eb6d61701acf1bb6b28ff9bd28b4e8f67a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Wed, 11 Mar 2026 17:44:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_notice/views/yuthon_notice_views.xml   |  8 ++++----
 .../models/inherit_room_booking.py            |  2 +-
 .../views/yuthon_will_task_views.xml          | 19 +++++++++++++------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/yuthon_notice/views/yuthon_notice_views.xml b/yuthon_notice/views/yuthon_notice_views.xml
index 41d1eedfc..c6ae16146 100644
--- a/yuthon_notice/views/yuthon_notice_views.xml
+++ b/yuthon_notice/views/yuthon_notice_views.xml
@@ -15,10 +15,10 @@
                 <field name="create_date1"/>
                 <field name="end_date"/>
                 <field name="notice_state" class="list_ids_width"/>
-                <button name="on_sequence" string="置顶" invisible="sequence != 0" type="object" class="btn btn-blue"/>
-                <button name="no_sequence" string="取消置顶" invisible="sequence != 1" type="object" class="btn btn-blue"/>
-                <button name="look_up_notice_users" string="查阅情况" type="object" class="btn btn-blue"/>
-                <button name="stop_notice" string="终止" type="object" class="btn btn-blue"/>
+                <button name="on_sequence" string="置顶" invisible="sequence != 0" type="object" class="btn-primary"/>
+                <button name="no_sequence" string="取消置顶" invisible="sequence != 1" type="object" class="btn-primary"/>
+                <button name="look_up_notice_users" string="查阅情况" type="object" class="btn-primary"/>
+                <button name="stop_notice" string="终止" type="object" class="btn-primary"/>
                 <field name="sequence" column_invisible="1"/>
             </tree>
         </field>
diff --git a/yuthon_will_task/models/inherit_room_booking.py b/yuthon_will_task/models/inherit_room_booking.py
index d746f52e2..ab1f0b61b 100644
--- a/yuthon_will_task/models/inherit_room_booking.py
+++ b/yuthon_will_task/models/inherit_room_booking.py
@@ -78,7 +78,7 @@ class InheritRoomBooking(models.Model):
 
         if task_time_ids:
             start_datetime = new_record.start_datetime
-            start_date = start_datetime.date()
+            start_date = (start_datetime + timedelta(hours=8)).date()
             request_hour_from = get_hour_selection(new_record.start_datetime)
             request_hour_to = get_hour_selection(new_record.stop_datetime)
             task_id = self.env['yuthon.will.task'].sudo().create({
diff --git a/yuthon_will_task/views/yuthon_will_task_views.xml b/yuthon_will_task/views/yuthon_will_task_views.xml
index 8d5a4c0fd..7a886d722 100644
--- a/yuthon_will_task/views/yuthon_will_task_views.xml
+++ b/yuthon_will_task/views/yuthon_will_task_views.xml
@@ -80,21 +80,28 @@
                     </div>
                     <group col="2">
                         <group>
-                            <label for="start_date"/>
+                            <label for="start_date" string="开始日期"/>
                             <div class="d-inline-flex w-100">
-                                <!--                            <field name="msg_id"/>-->
-                                <field name="start_date" string="日期" class="me-2"
+                                <field name="start_date" string="开始日期" class="me-2"
                                        style="max-width: 6rem !important;"/>
                                 <field name="task_week" string="" class="me-2" style="max-width: 4rem !important;"/>
                                 <field name="request_hour_from" string=" " class="ms-2"
                                        style="max-width: 5rem !important;"/>
+                            </div>
+                        </group>
+                        <group>
+                            <label for="request_hour_to" string="结束日期"/>
+                            <div class="d-inline-flex w-100">
+                                <field name="start_date" string="结束日期" class="me-2" readonly="1"
+                                       style="max-width: 6rem !important;"/>
+                                <field name="task_week" string="" class="me-2" readonly="1" style="max-width: 4rem !important;"/>
                                 <field name="request_hour_to" string=" " class="ms-2"
                                        style="max-width: 5rem !important;"/>
                             </div>
                         </group>
-                        <group>
-                            <field name="task_time_ids" widget="many2many_tags"/>
-                        </group>
+                    </group>
+                    <group>
+                        <field name="task_time_ids" widget="many2many_tags"/>
                     </group>
                     <group>
                         <field name="employee_id"/>