From 7b23f31bc732f0c61ff324e8c335c0535e5c0356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 18 Dec 2025 15:21:20 +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

---
 .../models/yuthon_official_incoming_normal.py |  4 ++--
 .../views/yuthon_dates_task_views.xml         | 20 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/yuthon_official/models/yuthon_official_incoming_normal.py b/yuthon_official/models/yuthon_official_incoming_normal.py
index 7a303b096..9850cd85e 100644
--- a/yuthon_official/models/yuthon_official_incoming_normal.py
+++ b/yuthon_official/models/yuthon_official_incoming_normal.py
@@ -23,8 +23,8 @@ class YuthonOfficialIncomingNormal(models.Model):
     secret_level = fields.Selection([('normal', '一般'), ('urgent', '秘密'), ('secret', '机密'), ('so_secret', '绝密')], string="密级")
     time_date = fields.Datetime(string="日期", default=fields.Datetime.now)
     users_id = fields.Many2one('res.users', string="拟办人", default=lambda self: self.env.user.id)
-    department_id = fields.Many2one(related='users_id.employee_id.department_id', string="拟办部门")
-    company_id = fields.Many2one(related='users_id.employee_id.company_id', string="公司")
+    department_id = fields.Many2one(related='users_id.employee_ids.department_id', string="拟办部门")
+    company_id = fields.Many2one(related='users_id.employee_ids.company_id', string="公司")
     department_data = fields.Html(string="拟办意见")
     red_suit = fields.Char(string="套红")
     official_statu = fields.Selection([('done', '办结'), ('approval', '审核')], string="公文环节")
diff --git a/yuthon_will_task/views/yuthon_dates_task_views.xml b/yuthon_will_task/views/yuthon_dates_task_views.xml
index 34e84375a..44ba22079 100644
--- a/yuthon_will_task/views/yuthon_dates_task_views.xml
+++ b/yuthon_will_task/views/yuthon_dates_task_views.xml
@@ -4,7 +4,10 @@
         <field name="name">yuthon.dates.task.tree</field>
         <field name="model">yuthon.dates.task</field>
         <field name="arch" type="xml">
-            <tree string="日程任务" editable="bottom">
+            <tree string="日程任务" editable="bottom"
+              decoration-success="task_state == 'to_do'"
+              decoration-warning="task_state == 'done'"
+            >
                <field name="yuthon_will_task_id"/>
                <field name="employee_ids" widget="many2many_tags" options="{'no_create': True}"/>
                <field name="reminder_time"/>
@@ -12,9 +15,24 @@
             </tree>
         </field>
     </record>
+    <record id="view_yuthon_dates_task_search" model="ir.ui.view">
+        <field name="name">yuthon.dates.task.search</field>
+        <field name="model">yuthon.dates.task</field>
+        <field name="arch" type="xml">
+            <search string="日程任务">
+                <field name="yuthon_will_task_id"/>
+            </search>
+            <group expand="0" string="Group By">
+                <filter name="task_state" string="状态" context="{'group_by':'task_state'}"/>
+            </group>
+        </field>
+    </record>
     <record id="view_yuthon_dates_task_action" model="ir.actions.act_window">
         <field name="name">日程任务</field>
         <field name="res_model">yuthon.dates.task</field>
         <field name="view_mode">tree</field>
+        <field name="view_id" ref="view_yuthon_dates_task_tree"/>
+        <field name="search_view_id" ref="view_yuthon_dates_task_search"/>
+        <field name="context">{'search_default_task_state':1}</field>
     </record>
 </odoo>