From 79c45e32504e9d7c55eb1832186cc7cce94b7367 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Wed, 7 May 2025 10:18:29 +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_issue/models/issue_approval_decision.py       | 2 +-
 yuthon_issue/models/issue_library_type.py            | 2 +-
 yuthon_issue/views/issue_approval_decision_views.xml | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/yuthon_issue/models/issue_approval_decision.py b/yuthon_issue/models/issue_approval_decision.py
index 5d6654454..24e0085af 100644
--- a/yuthon_issue/models/issue_approval_decision.py
+++ b/yuthon_issue/models/issue_approval_decision.py
@@ -18,7 +18,7 @@ class IssueApprovalDecision(models.Model):
     district_government_id = fields.Many2one('issue.library.type', string="区政府",)
     district_party_id= fields.Many2one('issue.library.type', string="区委组织部")
     department_id = fields.Many2one('hr.department', string="部门")
-    management_matters = fields.Char(string='管理事项')
+    management_matters_id = fields.Many2one('issue.approval.decision.type', string='管理事项')
     company_id = fields.Many2one('res.company', string="公司", default=lambda self: self._get_default_company())
     scope = fields.Selection([('one', '一级区属国有企业'), ('two', '二级区属国有企业'), ('one_two', '一级、二级区属国有企业')], string='适用范围', default='one')
     start_date = fields.Date(string="生效日期")
diff --git a/yuthon_issue/models/issue_library_type.py b/yuthon_issue/models/issue_library_type.py
index 4b1fd46c2..beb3b00cf 100644
--- a/yuthon_issue/models/issue_library_type.py
+++ b/yuthon_issue/models/issue_library_type.py
@@ -8,6 +8,6 @@ class IssueLibraryType(models.Model):
     _description = '决策类型配置'
     _rec_name = 'name'
 
-    name = fields.Char(string="事项类别")
+    name = fields.Char(string="决策类别")
 
 
diff --git a/yuthon_issue/views/issue_approval_decision_views.xml b/yuthon_issue/views/issue_approval_decision_views.xml
index e52408b37..90b5b21b6 100644
--- a/yuthon_issue/views/issue_approval_decision_views.xml
+++ b/yuthon_issue/views/issue_approval_decision_views.xml
@@ -5,11 +5,11 @@
         <field name="model">issue.approval.decision</field>
         <field name="arch" type="xml">
             <tree string="决策清单">
-                <field name="sequence"/>
+                <field name="sequence" column_invisible="1"/>
                 <field name="specifics" required="1"/>
                 <field name="decision_type_id"/>
                 <field name="decision_type_on_id" column_invisible="1"/>
-                <field name="management_matters"/>
+                <field name="management_matters_id"/>
                 <field name="council_id"/>
                 <field name="team_meet_id"/>
                 <field name="board_meet_id"/>
@@ -81,6 +81,7 @@
                     <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 name="management_matters_id" string="管理事项" context="{'group_by': 'management_matters_id'}"/>
                 </group>
             </search>
         </field>
@@ -101,6 +102,7 @@
         <field name="name">决策清单</field>
         <field name="res_model">issue.approval.decision</field>
         <field name="view_mode">tree,form</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">
         <field name="name">更新公司和适用范围</field>