From 8f630093ecde3820b8f282a50a7378428eb0377c Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Tue, 5 Aug 2025 18:30:02 +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

---
 .../views/yuthon_vacation_reports_views.xml           | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
index 76e8a22fc..5bce5f6a9 100644
--- a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
@@ -4,7 +4,7 @@
         <field name="name">yuthon.vacation.reports.tree</field>
         <field name="model">yuthon.vacation.reports</field>
         <field name="arch" type="xml">
-             <tree string="假期额度记录" editable="bottom" edit="0">
+             <tree string="假期额度记录" editable="bottom" edit="0" default_order="vacation_date desc">
                 <field name="employee_id" options="{'no_open': True}"/>
                 <field name="department_id" column_invisible="1"/>
                 <field name="company_id" column_invisible="1"/>
@@ -44,7 +44,7 @@
         <field name="name">yuthon.vacation.my.reports.tree</field>
         <field name="model">yuthon.vacation.reports</field>
         <field name="arch" type="xml">
-            <tree string="我的假期额度记录" editable="bottom">
+            <tree string="我的假期额度记录" editable="bottom" default_order="vacation_date desc">
                 <field name="employee_id" options="{'no_open': True}"/>
                 <field name="department_id" column_invisible="1"/>
                 <field name="company_id" column_invisible="1"/>
@@ -228,7 +228,8 @@
                     <field name="employee_id"/>
                     <group expand="0" string="Group By">
                         <filter string="员工" name="group_by_employee_id" domain="[]" context="{'group_by': 'employee_id'}"/>
-                        <filter string="日期" name="group_by_vacation_date" domain="[]" context="{'group_by' : 'vacation_date'}"/>
+                        <filter string="按年" name="group_by_vacation_year" domain="[]" context="{'group_by': 'vacation_date:year'}"/>
+                        <filter string="按月" name="group_by_vacation_month" domain="[]" context="{'group_by': 'vacation_date:month'}"/>
                     </group>
                 </search>
             </field>
@@ -365,7 +366,7 @@
         <field name="name">假期额度日志</field>
         <field name="res_model">yuthon.vacation.reports</field>
         <field name="view_mode">tree,form</field>
-        <field name="context">{'search_default_group_by_employee_id': 1, 'search_default_group_by_vacation_date': True}</field>
+        <field name="context">{'search_default_group_by_employee_id': 1, 'search_default_group_by_vacation_year': True, 'search_default_group_by_vacation_month': True}</field>
          <field name="view_ids" eval="[(5, 0, 0),
          (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_holiday.view_yuthon_vacation_reports_tree')}),
          (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_holiday.view_yuthon_vacation_reports_form')})]"/>
@@ -375,7 +376,7 @@
          <field name="res_model">yuthon.vacation.reports</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('employee_id.user_id', '=', uid)]</field>
-        <field name="context">{'search_default_group_by_vacation_date': 1}</field>
+        <field name="context">{'search_default_group_by_vacation_year': True, 'search_default_group_by_vacation_month': True}</field>
          <field name="view_ids" eval="[(5, 0, 0),
          (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_holiday.view_yuthon_vacation_my_reports_tree')}),
          (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_holiday.view_yuthon_vacation_reports_form1')})]"/>