From b2bb6ec37c60b75f233e402ab31e5b39bee7c8b1 Mon Sep 17 00:00:00 2001
From: pengyuthon <pengyuthon@163.com>
Date: Thu, 27 Jun 2024 15:33:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_approval/views/issue_library_views.xml | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/yuthon_approval/views/issue_library_views.xml b/yuthon_approval/views/issue_library_views.xml
index eced40551..2b9f3ba8d 100644
--- a/yuthon_approval/views/issue_library_views.xml
+++ b/yuthon_approval/views/issue_library_views.xml
@@ -62,26 +62,27 @@
         </field>
     </record>
 
+    <record id="view_issue_library_filter" model="ir.ui.view">
+        <field name="name">issue.library.search</field>
+        <field name="model">issue.library</field>
+        <field name="arch" type="xml">
+            <search string="议题">
+                <filter string="待上会" name="issue_status" domain="[('issue_status', '=', 'will_meeting')]"/>
+                <filter string="已上会" name="issue_status" domain="[('issue_status', '=', 'done_meeting')]"/>
+                <group expand="0">
+                    <filter name="group_manager" string="会议状态" domain="[]" context="{'group_by': 'issue_status'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
     <record id="issue_library_action" model="ir.actions.act_window">
         <field name="name">议题库</field>
         <field name="res_model">issue.library</field>
         <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="view_issue_library_filter"/>
     </record>
 
-    <!--    <record id="issue_library_search" model="ir.ui.view">-->
-    <!--        <field name="name">issue.library.search</field>-->
-    <!--        <field name="model">issue.library</field>-->
-    <!--        <field name="arch" type="xml">-->
-    <!--            <search>-->
-    <!--                <field name="name"/>-->
-    <!--                <field name="degree_importance"/>-->
-    <!--                <field name="issue_state"/>-->
-    <!--                <field name="company_id"/>-->
-    <!--                <group string="State" name="议题状态分组" context="{'group_by':'issue_state'}"/>-->
-    <!--            </search>-->
-    <!--        </field>-->
-    <!--    </record>-->
-
     <menuitem
             id="tianhe_issue_library_menu"
             parent="approvals.approvals_menu_config"