From e7b7dcda948c46e041fb873ea5dec731a23c546c 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, 6 May 2026 10:13:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E7=A8=8B=EF=BC=8C=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_hr_attendance/wizard/export_date_wizard.py | 2 +-
 yuthon_issue/views/issue_library_views.xml        | 6 +++---
 yuthon_will_task/views/yuthon_will_task_views.xml | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/yuthon_hr_attendance/wizard/export_date_wizard.py b/yuthon_hr_attendance/wizard/export_date_wizard.py
index c6b9a5438..dd1398b7d 100644
--- a/yuthon_hr_attendance/wizard/export_date_wizard.py
+++ b/yuthon_hr_attendance/wizard/export_date_wizard.py
@@ -55,7 +55,7 @@ class ExportDateWizard(models.TransientModel):
         """导出请假情况"""
         active_ids = json.loads(self.active_ids) if self.active_ids else []
         
-        domain = [('date_from', '>=', start_date), ('date_from', '<', end_date)]
+        domain = [('date_from', '>=', start_date), ('date_from', '<', end_date), ('state', '!=', 'refuse')]
         if active_ids:
             domain = [('id', 'in', active_ids)] + domain
         
diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml
index 50de94665..93eab3984 100644
--- a/yuthon_issue/views/issue_library_views.xml
+++ b/yuthon_issue/views/issue_library_views.xml
@@ -251,9 +251,9 @@
                                            string="党支部"/>
                                     <field name="team_meet_id" readonly="1"/>
                                     <field name="board_meet_id" readonly="1"/>
-                                    <field name="district_state_id" readonly="1"/>
-                                    <field name="district_government_id" readonly="1"/>
-                                    <field name="district_party_id" readonly="1"/>
+                                    <field name="district_state_id" readonly="1" column_invisible="True"/>
+                                    <field name="district_government_id" readonly="1" column_invisible="True"/>
+                                    <field name="district_party_id" readonly="1" column_invisible="True"/>
                                     <field name="remarks" readonly="1"/>
                                 </tree>
                             </field>
diff --git a/yuthon_will_task/views/yuthon_will_task_views.xml b/yuthon_will_task/views/yuthon_will_task_views.xml
index 2f80701d6..10cefb9d2 100644
--- a/yuthon_will_task/views/yuthon_will_task_views.xml
+++ b/yuthon_will_task/views/yuthon_will_task_views.xml
@@ -286,7 +286,6 @@
                 <field name="request_hour_from"/>
                 <field name="request_hour_to"/>
                 <field name="employee_ids"/>
-                <field name="employee_ids_short"/>
                 <field name="address"/>
                 <field name="remarks"/>
                 <templates>
@@ -317,13 +316,13 @@
                             <!-- 参与人 -->
                             <t t-if="record.employee_ids.raw_value and record.employee_ids.raw_value.length">
                                 <div style="color: #555; font-size: 13px; margin-bottom: 4px;">
-                                    参与人 <field name="employee_ids_short"/>等共<t t-esc="record.employee_ids.raw_value.length"/>人
+                                    参与人 <field name="employee_ids" widget="many2many_tags"/>共<t t-esc="record.employee_ids.raw_value.length"/>人
                                 </div>
                             </t>
                             <!-- 会议室 -->
                             <t t-if="record.address.raw_value">
                                 <div style="color: #555; font-size: 13px; margin-bottom: 4px;">
-                                    会议室 <field name="address"/>
+                                    地点 <field name="address"/>
                                 </div>
                             </t>
                             <!-- 备注 -->