From 7fc2c1ec38865a004a3c9b21fbdfcd73283b1270 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, 22 Jan 2026 20:46:56 +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

---
 yuthon_hr_employee/__manifest__.py             |  1 -
 .../views/issue_approval_decision_views.xml    | 18 ++----------------
 yuthon_issue/views/issue_library_views.xml     |  8 ++++----
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/yuthon_hr_employee/__manifest__.py b/yuthon_hr_employee/__manifest__.py
index 7b0da0e38..fff2de219 100644
--- a/yuthon_hr_employee/__manifest__.py
+++ b/yuthon_hr_employee/__manifest__.py
@@ -19,7 +19,6 @@
         'data/employee_recruitment_time_data.xml',
         'data/publish_applicant_setting_data.xml',
         'security/ir.model.access.csv',
-        'security/company_rule.xml',
         'views/yuthon_hr_employee_views.xml',
         'views/yuthon_hr_department_views.xml',
         'views/applicant_tage_setting_views.xml',
diff --git a/yuthon_issue/views/issue_approval_decision_views.xml b/yuthon_issue/views/issue_approval_decision_views.xml
index 8bc051342..c5680f3d2 100644
--- a/yuthon_issue/views/issue_approval_decision_views.xml
+++ b/yuthon_issue/views/issue_approval_decision_views.xml
@@ -80,34 +80,20 @@
         <field name="model">issue.approval.decision</field>
         <field name="arch" type="xml">
             <search>
-                <searchpanel>
-                    <field name="decision_type_on_id"/>
-                </searchpanel>
                 <group expand="1">
                     <filter name="group_decision_type_on_id" string="事项类别上级"
                             context="{'group_by': 'decision_type_on_id'}"/>
                     <filter name="group_decision_type_id" string="事项类别" context="{'group_by': 'decision_type_id'}"/>
+                    <filter string="适用范围" name="group_scope" context="{'group_by': 'scope'}"/>
                     <filter name="group_management_matters_id" string="管理事项" context="{'group_by': 'management_matters_id'}"/>
                 </group>
             </search>
         </field>
     </record>
-
-    <record id="issue_approval_decision_search" model="ir.ui.view">
-        <field name="name">issue.approval.decision.search</field>
-        <field name="model">issue.approval.decision</field>
-        <field name="priority">20</field>
-        <field name="arch" type="xml">
-            <search>
-                <field name="specifics"/>
-            </search>
-        </field>
-    </record>
-
     <record id="issue_approval_decision_action" model="ir.actions.act_window">
         <field name="name">决策清单</field>
         <field name="res_model">issue.approval.decision</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">tree,form,search</field>
         <field name="context">{'group_decision_type_id': 1, 'group_management_matters_id': 1}</field>
     </record>
    <record id="all_update_issue" model="ir.actions.server">
diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml
index 69294dac0..ca4635813 100644
--- a/yuthon_issue/views/issue_library_views.xml
+++ b/yuthon_issue/views/issue_library_views.xml
@@ -198,7 +198,7 @@
                                 <tree editable="bottom">
                                     <field name="ordinal"/>
                                     <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="issue_approval_decision_id" class="list_ids_width"/>
+                                    <field name="issue_approval_decision_id" class="list_ids_width" context="{'search_default_group_scope': 1}"/>
                                     <field name="council_id" readonly="1" groups="yuthon_salary.group_jtbb_user" string="党总支"/>
                                     <field name="council_id" readonly="1" groups="yuthon_salary.group_wg_user, yuthon_salary.group_lc_user"  string="党支部"/>
                                     <field name="team_meet_id" readonly="1"/>
@@ -408,7 +408,7 @@
                             <field name="issue_library_line_ids">
                                 <tree editable="bottom">
                                     <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="issue_approval_decision_id" class="list_ids_width"/>
+                                    <field name="issue_approval_decision_id" class="list_ids_width" context="{'search_default_group_scope': 1}"/>
                                     <field name="council_id" readonly="1"/>
                                     <field name="district_state_id" readonly="1"/>
                                     <field name="district_government_id" readonly="1"/>
@@ -565,7 +565,7 @@
                                 <tree editable="bottom">
                                     <field name="ordinal"/>
                                     <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="issue_approval_decision_id" class="list_ids_width"/>
+                                    <field name="issue_approval_decision_id" class="list_ids_width" context="{'search_default_group_scope': 1}"/>
                                     <field name="team_meet_id" readonly="1"/>
                                     <field name="district_state_id" readonly="1"/>
                                     <field name="district_government_id" readonly="1"/>
@@ -712,7 +712,7 @@
                                 <tree editable="bottom">
                                     <field name="ordinal"/>
                                     <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="issue_approval_decision_id" class="list_ids_width"/>
+                                    <field name="issue_approval_decision_id" class="list_ids_width" context="{'search_default_group_scope': 1}"/>
                                     <field name="board_meet_id" readonly="1"/>
                                     <field name="district_state_id" readonly="1"/>
                                     <field name="district_government_id" readonly="1"/>