From 1a725ecfb0a64eea373da796a94db8561f9d44de Mon Sep 17 00:00:00 2001
From: pengyuthon <pengyuthon@163.com>
Date: Tue, 13 Jan 2026 22:16:46 +0800
Subject: [PATCH] 1

---
 .../templates/soong_workflow_templates.xml    | 19 +------------------
 .../wizard/soong_workflow_comment_wizard.py   |  2 +-
 yuthon_salary/controllers/salary_phone.py     | 13 +++++++++----
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/soong_workflow/templates/soong_workflow_templates.xml b/soong_workflow/templates/soong_workflow_templates.xml
index 58dd111cf..b22cb759d 100644
--- a/soong_workflow/templates/soong_workflow_templates.xml
+++ b/soong_workflow/templates/soong_workflow_templates.xml
@@ -2,7 +2,7 @@
 <odoo>
     <template id="soong_workflow_log_manager">
         <notebook>
-            <page string="审批详情" invisible="work_end">
+            <page string="审批详情">
                 <field name="log_ids" style="width:100%; margin-top: 10px;" mode="kanban,tree" context="{'kanban_view_ref':'soong_workflow.soong_workflow_log_kanban'}">
                     <tree editable="bottom">
                         <field name="sequence" string="" widget="handle" groups="soong_workflow.group_soong_workflow_manager"/>
@@ -17,23 +17,6 @@
                     </tree>
                 </field>
             </page>
-            <page string="审批详情" invisible="not work_end">
-                <field name="log_ids" style="width:100%; margin-top: 10px;" domain="[('node_btn_name', '!=', '1')]" context="{'kanban_view_ref':'soong_workflow.soong_workflow_log_kanban'}">
-                    <tree editable="bottom">
-                        <field name="sequence" string="" widget="handle"
-                               groups="soong_workflow.group_soong_workflow_manager"/>
-                        <field name="name" string="" readonly="0"/>
-                        <field name="comment" string=""/>
-                        <field name="msg_id" column_invisible="1"/>
-                        <field name="done_by" string="" column_invisible="1"/>
-                        <field name="display_field" string=""/>
-                        <field name="lase_click_date" string="" groups="base.group_system"/>
-                        <field name="approval_state" string=""/>
-                        <field name="node_btn_name" string="" groups="soong_workflow.group_soong_workflow_manager"/>
-                        <field name="document_ids" string="" widget="preview_many2many"/>
-                    </tree>
-                </field>
-            </page>
             <page string="抄送/传阅记录" invisible="not log_ids2" mode="kanban,tree" context="{'kanban_view_ref':'soong_workflow.soong_workflow_log2_kanban'}">
                 <field name="log_ids2" style="width:100%; margin-top: 10px;">
                     <tree editable="bottom" >
diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index cfa4e0d7f..0f3a50b18 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -702,7 +702,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                                                                              title=record_id._description,
                                                                              description=f"编号为{record_id.code}的{record_id._description}已结束，请归档",
                                                                              url=url, btntxt="查看详情")
-            return self.node_btn_id.with_context(cx).run()
+                self.node_btn_id.with_context(cx).run()
         if self.node_btn_name == "分发":
             record_id.is_send = True
             menu_id = self.env['ir.ui.menu'].search([('name', '=', '行政收文')])
diff --git a/yuthon_salary/controllers/salary_phone.py b/yuthon_salary/controllers/salary_phone.py
index f21900d42..06147c0ca 100644
--- a/yuthon_salary/controllers/salary_phone.py
+++ b/yuthon_salary/controllers/salary_phone.py
@@ -9,7 +9,7 @@ class YuthonWillTask(http.Controller):
 
     @http.route('/party/list', methods=['POST'], type='http', auth='public', csrf=False)
     def party_list(self, **kwargs):
-        party_ids = request.env['yuthon.salary.party'].sudo().search([])[0]
+        party_ids = request.env['yuthon.salary.party'].sudo().search([('employee_id.id', '=', kwargs.get('employee_id'))])
         data_list = []
         for party in party_ids:
             result = {
@@ -20,15 +20,20 @@ class YuthonWillTask(http.Controller):
                 'payment': party.payment,
                 'total_payment': party.total_payment,
                 'toll_state': party.toll_state,
+                'year_total': sum(party_ids.filtered(lambda p: p.select_year == party.select_year).mapped('total_payment'))
             }
             data_list.append(result)
         return json.dumps({'data': data_list, 'code': 200, 'message': 'success'})
 
     @http.route('/party/list/confirm', methods=['POST'], type='http', auth='public', csrf=False)
-    def meal_list_confirm(self, **kwargs):
+    def party_list_confirm(self, **kwargs):
         meal_id = request.env['yuthon.salary.party'].sudo().search([('id', '=', kwargs.get('id'))])
-        meal_id.write({'toll_state': 'True'})
-
+        meal_id.write({'toll_state': 'done'})
+        if not meal_id:
+            return json.dumps({'code': 200, 'message': '没有找到对应的数据id'})
+        else:
+            return json.dumps({'code': 200, 'message': 'OK'})
+        
     @http.route('/meal/list', methods=['POST'], type='http', auth='public', csrf=False)
     def meal_list(self, **kwargs):
         meal_ids = request.env['yuthon.meal.expenses'].sudo().search([('employee_id.id', '=', kwargs.get('employee_id'))])