From ab55036b7c83418de09276aa22bfba4644300a33 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Wed, 7 May 2025 20:22:34 +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

---
 room/__manifest__.py                                   | 1 +
 room/static/scss/room_meeting_scss.scss                | 9 +++++++++
 room/views/room_meeting_type.xml                       | 4 ++--
 yuthon_hr_attendance/views/card_remind_form.xml        | 2 +-
 yuthon_hr_employee/views/yuthon_hr_employee_views.xml  | 2 +-
 yuthon_will_task/static/src/scss/yuthon_will_task.scss | 3 ++-
 yuthon_will_task/views/yuthon_will_task_views.xml      | 2 +-
 7 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 room/static/scss/room_meeting_scss.scss

diff --git a/room/__manifest__.py b/room/__manifest__.py
index ce8d2fd9c..b698c541e 100644
--- a/room/__manifest__.py
+++ b/room/__manifest__.py
@@ -40,6 +40,7 @@
         'web.assets_backend': [
             'room/static/src/room_booking_gantt_view/**/*',
             "room/static/src/css/form_width.css",
+            "room/static/scss/room_meeting_scss.scss",
         ],
         'room.assets_room_booking': [
             # 1 Define room variables (takes priority)
diff --git a/room/static/scss/room_meeting_scss.scss b/room/static/scss/room_meeting_scss.scss
new file mode 100644
index 000000000..0d694a65a
--- /dev/null
+++ b/room/static/scss/room_meeting_scss.scss
@@ -0,0 +1,9 @@
+
+.list_room_width{
+    width: 80px !important;
+    max-width: 80px !important;
+}
+.list_room_width2{
+    width: 120px !important;
+    max-width: 120px !important;
+}
\ No newline at end of file
diff --git a/room/views/room_meeting_type.xml b/room/views/room_meeting_type.xml
index c8c5ea17a..8ac40fb90 100644
--- a/room/views/room_meeting_type.xml
+++ b/room/views/room_meeting_type.xml
@@ -6,8 +6,8 @@
         <field name="arch" type="xml">
             <tree editable="bottom">
                 <field name="sequence" widget="handle"/>
-                <field name="name"/>
-                <field name="host_id"/>
+                <field name="name" class="list_room_width2"/>
+                <field name="host_id" class="list_room_width2"/>
                 <field name="room_users_ids" widget="many2many_tags"/>
                 <field name="host_user_id" column_invisible="1"/>
                 <field name="users_ids" widget="many2many_tags" column_invisible="1"/>
diff --git a/yuthon_hr_attendance/views/card_remind_form.xml b/yuthon_hr_attendance/views/card_remind_form.xml
index 40df1a8a8..95280946e 100644
--- a/yuthon_hr_attendance/views/card_remind_form.xml
+++ b/yuthon_hr_attendance/views/card_remind_form.xml
@@ -12,7 +12,7 @@
         </field>
     </record>
     <record id="view_action_card_remind" model="ir.actions.act_window">
-        <field name="name">Card Remind</field>
+        <field name="name">考勤提醒表单</field>
         <field name="res_model">card.remind.form</field>
         <field name="view_mode">tree</field>
     </record>
diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
index 3bbac2ba9..e7a3891e3 100644
--- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
@@ -352,11 +352,11 @@
                 <attribute name="class">list_employee_width</attribute>
             </xpath>
             <xpath expr="//field[@name='job_id']" position="after">
+                <field name="user_role_id"/>
                 <field name="use_user_type"/>
                 <field name="salary_group_id" column_invisible="1"/>
                 <field name="user_number" optional="hide"/>
                 <field name="mobile_phone" optional="hide"/>
-                <field name="user_role_id"/>
                 <field name="confirmation_date" optional="hide"/>
                 <field name="user_number_start_time" optional="hide"/>
                 <field name="nation" optional="hide"/>
diff --git a/yuthon_will_task/static/src/scss/yuthon_will_task.scss b/yuthon_will_task/static/src/scss/yuthon_will_task.scss
index 3b2ee2381..2241ab8a0 100644
--- a/yuthon_will_task/static/src/scss/yuthon_will_task.scss
+++ b/yuthon_will_task/static/src/scss/yuthon_will_task.scss
@@ -1,3 +1,4 @@
 .button_width{
     width: 100px !important;
-}
\ No newline at end of file
+    max-width: 100px !important;
+}
diff --git a/yuthon_will_task/views/yuthon_will_task_views.xml b/yuthon_will_task/views/yuthon_will_task_views.xml
index 599c447ff..fd4506681 100644
--- a/yuthon_will_task/views/yuthon_will_task_views.xml
+++ b/yuthon_will_task/views/yuthon_will_task_views.xml
@@ -21,7 +21,7 @@
                 <field name='remarks'/>
                 <field name='users_ids' widget="many2many_tags" column_invisible="1"/>
                 <field name='user_role_ids' widget="many2many_tags" column_invisible="1"/>
-                <field name='employee_ids2' widget="many2many_tags" domain="[('user_role_ids.name', 'in', ['司机'])]"/>
+                <field name='employee_ids2' widget="many2many_tags" domain="[('user_role_ids.name', 'in', ['司机'])]" class="button_width"/>
                 <field name='task_state' readonly="1"/>
                 <button name="button_add_comment" string="提醒" type="object" class="oe_highlight" invisible="task_state == 'cancel'"/>
                 <button name="button_add_comment_cancel" string="取消" type="object" class="oe_highlight" invisible="task_state == 'cancel'"/>