From f5ef0b9656f418d3d1110f5ff80932762b99ecf4 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Tue, 19 Aug 2025 15:36:57 +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

---
 .../views/soong_workflow_record.xml           | 36 +++++++++++++++----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml
index c8a243504..02b8e77f7 100644
--- a/soong_workflow/views/soong_workflow_record.xml
+++ b/soong_workflow/views/soong_workflow_record.xml
@@ -17,18 +17,40 @@
                     <field name="documents_ids" optional="hide"/>
                     <group expand="0" string="审批分组">
                         <filter string="审批类型分组" name='group_by_approvals_group_id' context="{'group_by':'approvals_group_id'}"/>
+                        <filter string="状态" name="group_soong_state" context="{'group_by':'soong_state'}"/>
                     </group>
                     <header_search>
                     <quick_filter string="状态">
                          <filter string="草稿" name="approve_state" domain="[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'start')]"/>
-                         <filter string="待办" name="to_do" domain="[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'pending'), ('soong_state', '=', 'to_do')]"/>
-                         <filter string="已办" name="done" domain="[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'pending'), ('soong_state', '=', 'done')]"/>
+                         <filter string="待办" name="to_do" domain="[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'pending'), ('employee_ids.user_id', '=', uid)]"/>
+                         <filter string="已办" name="done" domain="[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'pending'), ('employee_ids.user_id', '!=', uid)]"/>
                          <filter string="结束" name="end" domain="[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'end')]"/>
                     </quick_filter>
                 </header_search>
                 </search>
             </field>
         </record>
+        <record id="soong_workflow_record_search1" model="ir.ui.view">
+            <field name="name">soong.workflow.record.search</field>
+            <field name="model">soong.workflow.record</field>
+            <field name="arch" type="xml">
+                <search string="流程查询">
+                    <field name="name"
+                           string="综合搜索"
+                           filter_domain="['|', '|', '|', ('name', 'ilike', self), ('code', 'ilike', self), ('text', 'ilike', self), ('workflow_id.name', 'ilike', self)]"/>
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="done_by"/>
+                    <field name="workflow_id" string="审批类型"/>
+                    <field name="text" optional="hide"/>
+                    <field name="documents_ids" optional="hide"/>
+                    <group expand="0" string="审批分组">
+                        <filter string="审批类型分组" name='group_by_approvals_group_id' context="{'group_by':'approvals_group_id'}"/>
+                        <filter string="状态" name="group_soong_state" context="{'group_by':'soong_state'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
         <record id="soong_workflow_record_tree" model="ir.ui.view">
             <field name="name">soong.workflow.record.tree</field>
             <field name="model">soong.workflow.record</field>
@@ -132,7 +154,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">soong.workflow.record</field>
             <field name="view_mode">tree,kanban,search</field>
-            <field name="context">{'check_employee': 1}</field>
+            <field name="context">{'check_employee': 1, 'group_by': 'soong_state'}</field>
             <field name="domain">[('users_ids', 'in', uid), ('reclaim_state', '=', False)]</field>
             <field name="search_view_id" ref="soong_workflow_record_search"/>
         </record>
@@ -142,7 +164,7 @@
             <field name="res_model">soong.workflow.record</field>
             <field name="view_mode">tree,kanban,search</field>
             <field name="domain">[('reclaim_state', '=', False), '|', ('approvals_group_id.name', '=', '人力资源'), ('approvals_group_id.name', '=', '考勤')]</field>
-            <field name="search_view_id" ref="soong_workflow_record_search"/>
+            <field name="search_view_id" ref="soong_workflow_record_search1"/>
         </record>
         <record id="soong_workflow_other_record_action" model="ir.actions.act_window">
             <field name="name">流程查询</field>
@@ -151,7 +173,7 @@
             <field name="view_mode">tree,kanban,search</field>
             <field name="domain">[('reclaim_state', '=', False), ('approvals_group_id.name', '!=', '人力资源'), ('approvals_group_id.name', '!=', '考勤')]</field>
             <field name="context">{'search_default_my_department_shifts': True,}</field>
-            <field name="search_view_id" ref="soong_workflow_record_search"/>
+            <field name="search_view_id" ref="soong_workflow_record_search1"/>
         </record>
         <record id="soong_workflow_record_action_admin" model="ir.actions.act_window">
             <field name="name">流程监控</field>
@@ -159,7 +181,7 @@
             <field name="res_model">soong.workflow.record</field>
             <field name="view_mode">tree,form,search</field>
             <field name="domain">[('reclaim_state', '=', False)]</field>
-            <field name="search_view_id" ref="soong_workflow_record_search"/>
+            <field name="search_view_id" ref="soong_workflow_record_search1"/>
         </record>
         <record id="soong_workflow_record_action_reclaim" model="ir.actions.act_window">
             <field name="name">工作流回收站</field>
@@ -167,7 +189,7 @@
             <field name="res_model">soong.workflow.record</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('reclaim_state', '=', True)]</field>
-            <field name="search_view_id" ref="soong_workflow_record_search"/>
+            <field name="search_view_id" ref="soong_workflow_record_search1"/>
             <field name="view_ids" eval="[(5, 0, 0),
              (0, 0, {'view_mode': 'tree', 'view_id': ref('soong_workflow.soong_workflow_record_tree_restore')})]"/>
         </record>