From 2a0eb06fa66686ccd0ec384f9d7ef3f9d50c52a3 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Tue, 19 Aug 2025 15:11:18 +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

---
 .../controllers/home.py                       |  4 +-
 .../models/soong_workflow_record.py           | 18 +-------
 .../views/soong_workflow_record.xml           | 44 +++++--------------
 yuthon_purchase/models/purchase_workflow.py   |  4 ++
 yuthon_work_brand/views/hr_menus.xml          | 32 +++-----------
 5 files changed, 25 insertions(+), 77 deletions(-)

diff --git a/sh_backmate_theme_adv_enterprise/controllers/home.py b/sh_backmate_theme_adv_enterprise/controllers/home.py
index 4af9a6013..48fc97fd9 100644
--- a/sh_backmate_theme_adv_enterprise/controllers/home.py
+++ b/sh_backmate_theme_adv_enterprise/controllers/home.py
@@ -23,9 +23,7 @@ MENU_BADGE_MODEL_FUNC_ENUM = {
     'yuthon_property.yuthon_property_tariff_list': {'model': 'property.tariff.list', 'func': 'get_no_read_count'},
     'yuthon_property.yuthon_property_water_list': {'model': 'property.water.list', 'func': 'get_no_read_count'},
     'yuthon_property.yuthon_property_deposit_list': {'model': 'property.deposit.list', 'func': 'get_no_read_count'},
-    'soong_workflow.menu_workflow_approval_request_my': {'model': 'soong.workflow.record', 'func': 'get_no_read_count'},
-    'soong_workflow.menu_workflow_approval_request_my_start': {'model': 'soong.workflow.record', 'func': 'get_start_read_count'},
-    'soong_workflow.menu_workflow_approval_request_my_pending_to_do': {'model': 'soong.workflow.record', 'func': 'get_pending_read_count'},
+    'soong_workflow.menu_workflow_approval_request_my_start': {'model': 'soong.workflow.record', 'func': 'get_no_read_count'},
     'soong_workflow.menu_workflow_approval_request_copy': {'model': 'soong.workflow.record.copy', 'func': 'get_no_read_count'},
     'yuthon_will_task.menu_yuthon_will_task_root': {'model': 'yuthon.will.task', 'func': 'read_number'},
     'issue_library.yuthon_library_my_menu': {'model': 'issue.library', 'func': 'read_number'},
diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py
index 57669311d..43cc642ce 100644
--- a/soong_workflow/models/soong_workflow_record.py
+++ b/soong_workflow/models/soong_workflow_record.py
@@ -15,24 +15,8 @@ class SoongWorkflowRecord(models.Model):
 
     def get_no_read_count(self):
         domain = [
-            ('soong_state', '=', 'to_do'),
-            ('users_ids', 'in', self.env.user.id),
-            ('reclaim_state', '=', False)
-        ]
-        return self.search_count(domain)
-
-    def get_start_read_count(self):
-        domain = [
-            ('approve_state', '=', 'start'),
-            ('users_ids', 'in', self.env.user.id),
-            ('reclaim_state', '=', False)
-        ]
-        return self.search_count(domain)
-
-    def get_pending_read_count(self):
-        domain = [
-            ('soong_state', '=', 'to_do'),
             ('approve_state', '=', 'pending'),
+            ('soong_state', '=', 'to_do'),
             ('users_ids', 'in', self.env.user.id),
             ('reclaim_state', '=', False)
         ]
diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml
index df1e5c272..c8a243504 100644
--- a/soong_workflow/views/soong_workflow_record.xml
+++ b/soong_workflow/views/soong_workflow_record.xml
@@ -17,8 +17,15 @@
                     <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="end" domain="[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'end')]"/>
+                    </quick_filter>
+                </header_search>
                 </search>
             </field>
         </record>
@@ -120,40 +127,13 @@
                 </tree>
             </field>
         </record>
-        <record id="soong_workflow_record_start_action" model="ir.actions.act_window">
-            <field name="name">草稿</field>
+        <record id="soong_workflow_record_my_action" 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,kanban,search</field>
-            <field name="context">{'check_employee': 1, 'group_by': 'soong_state'}</field>
-            <field name="domain">[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'start')]</field>
-            <field name="search_view_id" ref="soong_workflow_record_search"/>
-        </record>
-        <record id="soong_workflow_record_pending_to_do_action" 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,kanban,search</field>
-            <field name="context">{'check_employee': 1, 'group_by': 'soong_state'}</field>
-            <field name="domain">[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'pending'), ('soong_state', '=', 'to_do')]</field>
-            <field name="search_view_id" ref="soong_workflow_record_search"/>
-        </record>
-        <record id="soong_workflow_record_pending_done_action" 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,kanban,search</field>
-            <field name="context">{'check_employee': 1, 'group_by': 'soong_state'}</field>
-            <field name="domain">[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'pending'), ('soong_state', '=', 'done')]</field>
-            <field name="search_view_id" ref="soong_workflow_record_search"/>
-        </record>
-        <record id="soong_workflow_record_end_action" 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,kanban,search</field>
-            <field name="context">{'check_employee': 1, 'group_by': 'soong_state'}</field>
-            <field name="domain">[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'end')]</field>
+            <field name="context">{'check_employee': 1}</field>
+            <field name="domain">[('users_ids', 'in', uid), ('reclaim_state', '=', False)]</field>
             <field name="search_view_id" ref="soong_workflow_record_search"/>
         </record>
         <record id="soong_workflow_hr_employee_action" model="ir.actions.act_window">
diff --git a/yuthon_purchase/models/purchase_workflow.py b/yuthon_purchase/models/purchase_workflow.py
index f6545ed94..cfc889a2f 100644
--- a/yuthon_purchase/models/purchase_workflow.py
+++ b/yuthon_purchase/models/purchase_workflow.py
@@ -197,9 +197,13 @@ class PurchaseServiceLine(models.Model):
 class PurchaseFixedAssets(models.Model):
     _name = 'purchase.fixed.assets'
 
+    name = fields.Char(string="名称")
+
 class PurchaseServiceOrders(models.Model):
     _name = 'purchase.service.orders'
 
+    name = fields.Char(string="名称")
+
 class PurchaseLowOrders(models.Model):
     _name = 'purchase.low.orders'
 
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml
index 92f4e0a60..8f75b9b0c 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/yuthon_work_brand/views/hr_menus.xml
@@ -617,45 +617,27 @@
               name="我的"
               web_icon="yuthon_work_brand,static/description/holiday.png"
               sequence="3"/>
-    <menuitem id="menu_workflow_approval_request_my"
-              name="我的流程"
-              parent="holiday_manage_menu_root_board"
-              sequence="1"/>
     <menuitem id="menu_workflow_approval_request_new"
               name="新建流程"
-              parent="menu_workflow_approval_request_my"
+              parent="holiday_manage_menu_root_board"
               action="soong_workflow.action_kklw_workflow_approval_request"
               sequence="1"/>
     <menuitem id="menu_workflow_approval_request_my_start"
-              name="草稿"
-              parent="menu_workflow_approval_request_my"
-              action="soong_workflow.soong_workflow_record_start_action"
+              name="我的流程"
+              parent="holiday_manage_menu_root_board"
+              action="soong_workflow.soong_workflow_record_my_action"
               sequence="2"/>
-    <menuitem id="menu_workflow_approval_request_my_pending_to_do"
-              name="待办"
-              parent="menu_workflow_approval_request_my"
-              action="soong_workflow.soong_workflow_record_pending_to_do_action"
-              sequence="3"/>
-    <menuitem id="menu_workflow_approval_request_my_pending_done"
-              name="已办"
-              parent="menu_workflow_approval_request_my"
-              action="soong_workflow.soong_workflow_record_pending_done_action"
-              sequence="4"/>
-    <menuitem id="menu_workflow_approval_request_my_end"
-              name="结束"
-              parent="menu_workflow_approval_request_my"
-              action="soong_workflow.soong_workflow_record_end_action"
-              sequence="5"/>
+
     <menuitem id="yuthon_notice_menu1_board"
               parent="holiday_manage_menu_root_board"
               name="通知公告"
               action="yuthon_notice.approval_notice_action"
-              sequence="2"/>
+              sequence="5"/>
     <menuitem id='menu_yuthon_will_task_root'
               name='我的日程'
               parent='holiday_manage_menu_root_board'
               action='yuthon_will_task.view_yuthon_will_task_action'
-              sequence='3'/>
+              sequence='10'/>
 
 
     <menuitem id="menu_hr_attendance_my_record_board"