From ba78325bfa3eb9563ea0d8cffa19f56cb04382ea Mon Sep 17 00:00:00 2001
From: ljmwkx <1340053001@qq.com>
Date: Wed, 29 May 2024 20:59:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=20=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_approval/__manifest__.py                |  2 +-
 .../models/inherit_approval_request.py         | 18 +++++++++---------
 .../views/inherit_approval_request_views.xml   |  7 +++++++
 .../wizard/approval_notice_wizard.py           |  7 ++++++-
 .../wizard/approval_notice_wizard_views.xml    | 12 ++++++++++++
 5 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/yuthon_approval/__manifest__.py b/yuthon_approval/__manifest__.py
index c2e215f9f..e4415eeb4 100644
--- a/yuthon_approval/__manifest__.py
+++ b/yuthon_approval/__manifest__.py
@@ -14,12 +14,12 @@
     'data': [
         'security/ir.model.access.csv',
         'data/approval_category_type_data.xml',
+        'wizard/approval_notice_wizard_views.xml',
         'views/inherit_approval_category_views.xml',
         'views/inherit_approval_request_views.xml',
         'views/approval_process_views.xml',
         'views/demo_approval_request.xml',
         'report/all_demo_report.xml',
-        'wizard/approval_notice_wizard_views.xml',
     ],
     'installable': True,
     'application': True,
diff --git a/yuthon_approval/models/inherit_approval_request.py b/yuthon_approval/models/inherit_approval_request.py
index f07df6133..9117ce99a 100644
--- a/yuthon_approval/models/inherit_approval_request.py
+++ b/yuthon_approval/models/inherit_approval_request.py
@@ -9,13 +9,13 @@ class ApprovalRequest(models.Model):
     def print_approval_report(self):
         return self.env.ref('yuthon_approval.all_demo_report_actions').report_action(self)
 
-    def action_approve(self):
-        super(ApprovalRequest, self).action_approve()
-        return {
-            "type": "ir.actions.act_window",
-            "name": "审批意见",
-            "res_model": "approval.notice.wizard",
-            "view_mode": "form",
-            "target": "new",
-        }
+    # def action_approve(self):
+    #     super(ApprovalRequest, self).action_approve()
+    #     return {
+    #         "type": "ir.actions.act_window",
+    #         "name": "审批意见",
+    #         "res_model": "approval.notice.wizard",
+    #         "view_mode": "form",
+    #         "target": "new",
+    #     }
 
diff --git a/yuthon_approval/views/inherit_approval_request_views.xml b/yuthon_approval/views/inherit_approval_request_views.xml
index 75aca1554..f23bf41ab 100644
--- a/yuthon_approval/views/inherit_approval_request_views.xml
+++ b/yuthon_approval/views/inherit_approval_request_views.xml
@@ -12,6 +12,13 @@
                 <button name="print_approval_report" string="打印" type="object"
                         invisible="request_status in ['new', 'cancel']"/>
             </xpath>
+
+             <xpath expr="//button[@name='action_approve']" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </xpath>
+            <xpath expr="//button[@name='action_approve']" position="after">
+                <button name="%(approval_notice_wizard_action)d" string="批准" type="action" invisible="request_status in ['approved', 'refused', 'cancel'] or user_status != 'pending'"/>
+            </xpath>
         </field>
     </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_approval/wizard/approval_notice_wizard.py b/yuthon_approval/wizard/approval_notice_wizard.py
index a9e30d2b3..928c947ce 100644
--- a/yuthon_approval/wizard/approval_notice_wizard.py
+++ b/yuthon_approval/wizard/approval_notice_wizard.py
@@ -11,4 +11,9 @@ class ApprovalNoticeWizard(models.TransientModel):
     approval_sign = fields.Char(string="审批签署")
 
     def confirm(self):
-        self.approval_notice_text = ''
+        self.ensure_one()
+        approver = self.sudo().approval_user_line_id.mapped('approver_ids').filtered(
+            lambda approver: approver.user_id == self.env.user
+        )
+        self.sudo().approval_user_line_id.action_approve(approver=approver)
+        approver.write({'approval_notice': self.approval_notice_text})
diff --git a/yuthon_approval/wizard/approval_notice_wizard_views.xml b/yuthon_approval/wizard/approval_notice_wizard_views.xml
index dfa93a4ad..5b82de80e 100644
--- a/yuthon_approval/wizard/approval_notice_wizard_views.xml
+++ b/yuthon_approval/wizard/approval_notice_wizard_views.xml
@@ -4,6 +4,7 @@
         <field name="model">approval.notice.wizard</field>
         <field name="arch" type="xml">
             <form>
+                <field name="approval_user_line_id" invisible="1" />
                 <group>
                     <field name="approval_notice_text"/>
                 </group>
@@ -17,4 +18,15 @@
             </form>
         </field>
     </record>
+   <record id="approval_notice_wizard_action" model="ir.actions.act_window">
+        <field name="name">审批意见弹窗</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">approval.notice.wizard</field>
+        <field name="context">{
+            'default_approval_user_line_id': active_id,
+        }</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+
 </odoo>
\ No newline at end of file