From 06a2e07ba2b7124b48d1eccfc33838bc5eb5f3f1 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Mon, 14 Apr 2025 15:37:12 +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

---
 soong_workflow/models/soong_workflow_record.py |  1 +
 soong_workflow/views/menuitem.xml              |  5 -----
 soong_workflow/views/soong_workflow_record.xml | 12 ++++--------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py
index 74f0deb76..a09de3d34 100644
--- a/soong_workflow/models/soong_workflow_record.py
+++ b/soong_workflow/models/soong_workflow_record.py
@@ -33,6 +33,7 @@ class SoongWorkflowRecord(models.Model):
     node_id = fields.Many2one(comodel_name="soong.workflow.node", string="当前节点")
     approve_state = fields.Selection([("start", "草稿"), ("pending", "审批中"), ("end", "结束")], default="start", string="审批状态")
     reclaim_state = fields.Boolean(string="回收")
+    approvals_group_id = fields.Many2one(related='workflow_id.approvals_group_id', string="审批分组", store=True)
 
     done_by = fields.Many2one(comodel_name="res.users", string="发起人")
     is_department_record = fields.Boolean(string="是否是本部门的数据", store=False, search="_search_is_department_record")
diff --git a/soong_workflow/views/menuitem.xml b/soong_workflow/views/menuitem.xml
index 0222489f7..00ae8b396 100644
--- a/soong_workflow/views/menuitem.xml
+++ b/soong_workflow/views/menuitem.xml
@@ -26,11 +26,6 @@
                   parent="menu_soong_workflow_root"
                   action="soong_workflow_record_action_admin"
                   sequence="11"/>
-        <menuitem id="menu_workflow_approval_request_employee"
-                  name="流程监控(人力资源)"
-                  parent="menu_soong_workflow_root"
-                  action="soong_workflow_record_action_employee"
-                  sequence="12"/>
         <menuitem id="menu_soong_workflow_entrust"
                   sequence="13"
                   name="流程委托"
diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml
index da79220e8..076e7f7ed 100644
--- a/soong_workflow/views/soong_workflow_record.xml
+++ b/soong_workflow/views/soong_workflow_record.xml
@@ -8,6 +8,9 @@
                 <search string="流程查询">
                     <field name="name"/>
                     <field name="workflow_id" string="审批类型"/>
+                    <group expand="0" string="审批分组">
+                        <filter string="审批类型分组" name='group_by_approvals_group_id' context="{'group_by':'approvals_group_id'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -23,6 +26,7 @@
                     <field name="code"/>
                     <field name="name"/>
                     <field name="workflow_id" string="审批类型"/>
+                    <field name="approvals_group_id"/>
                     <field name="node_id" string="当前节点"/>
                     <field name="approve_state" string="审批状态"/>
                     <field name="users_ids" string="用户" widget="many2many_tags" optional="hide"/>
@@ -115,14 +119,6 @@
 <!--            <field name="domain">[("is_department_record", "=", True)]</field>-->
             <field name="search_view_id" ref="soong_workflow_record_search"/>
         </record>
-        <record id="soong_workflow_record_action_employee" model="ir.actions.act_window">
-            <field name="name">流程监控(人力资源)</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">soong.workflow.record</field>
-            <field name="view_mode">tree,form</field>
-             <field name="domain">[('workflow_id.approvals_group_id.name', '=', '人力资源')]</field>
-            <field name="search_view_id" ref="soong_workflow_record_search"/>
-        </record>
         <record id="soong_workflow_record_action_reclaim" model="ir.actions.act_window">
             <field name="name">工作流回收站</field>
             <field name="type">ir.actions.act_window</field>