From d87b63c7bacd9fbc715bd9d1a70275fd82031352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Mon, 23 Mar 2026 17:01:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E5=81=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_holiday/models/inherit_hr_leave.py               | 1 +
 yuthon_holiday/views/hr_leave_batch.xml                 | 1 +
 yuthon_hr_attendance/views/yuthon_holiday_statement.xml | 5 +++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py
index 2f8002795..627c009e3 100644
--- a/yuthon_holiday/models/inherit_hr_leave.py
+++ b/yuthon_holiday/models/inherit_hr_leave.py
@@ -332,6 +332,7 @@ class HolidaysRequestBatch(models.Model):
     days = fields.Float(string='天数')
     hours = fields.Float(string='小时')
     text = fields.Text(string='申请事由')
+    main_stay_place = fields.Char(string='主要停留地')
     is_day = fields.Boolean(string='按天请假')
     is_hour = fields.Boolean(string='按小时请假')
     leave_ids = fields.One2many(string='按天请假详情', comodel_name='hr.leave', inverse_name='batch_id')
diff --git a/yuthon_holiday/views/hr_leave_batch.xml b/yuthon_holiday/views/hr_leave_batch.xml
index caa79ef6d..36680c7bd 100644
--- a/yuthon_holiday/views/hr_leave_batch.xml
+++ b/yuthon_holiday/views/hr_leave_batch.xml
@@ -58,6 +58,7 @@
                                        domain="[('employee_id.department_id', '=', department_id)]"/>
                                 <field name="days" invisible="1"/>
                                 <field name="employee_id" invisible="1" force_save="1"/>
+                                <field name="main_stay_place" string="主要停留地"/>
                                 <field name="text"/>
                                 <field name="create_date" invisible="1"/>
                                 <field name="work_end" invisible="1"/>
diff --git a/yuthon_hr_attendance/views/yuthon_holiday_statement.xml b/yuthon_hr_attendance/views/yuthon_holiday_statement.xml
index c4578b7ae..b16fa415c 100644
--- a/yuthon_hr_attendance/views/yuthon_holiday_statement.xml
+++ b/yuthon_hr_attendance/views/yuthon_holiday_statement.xml
@@ -46,17 +46,18 @@
         <field name="model">hr.leave</field>
         <field name="arch" type="xml">
             <search string="请假情况">
-                <field name="employee_id"/>
+                <field name="employee_id" domain="[('company_id', '=', company_id)]"/>
                 <field name="caption"/>
                 <filter string="员工" name="group_by_employee_id" domain="[]" context="{'group_by': 'employee_id'}"/>
                 <filter name="now_month" string="当月"  domain="[('date_from', '&gt;=', (context_today() + relativedelta(day=1)).strftime('%Y-%m-%d')),
                         ('date_from', '&lt;', (context_today() + relativedelta(months=+1, day=1)).strftime('%Y-%m-%d'))]"/>
                 <header_search class="header-search-inline">
                     <field name="date_from"/>
-                    <field name="employee_id"/>
+                    <field name="employee_id" domain="[('company_id', '=', company_id)]"/>
                 </header_search>
                 <searchpanel>
                     <field name="department_id" string="部门" enable_counters="1" select="multi"/>
+                    <field name="holiday_status_id" string="假期类型" enable_counters="1" select="multi"/>
                 </searchpanel>
             </search>
         </field>