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

---
 yuthon_approval/models/inherit_approval_approver.py      | 1 +
 yuthon_approval/views/inherit_approval_request_views.xml | 1 +
 yuthon_approval/wizard/approval_notice_wizard.py         | 7 +++++--
 yuthon_approval/wizard/approval_notice_wizard_views.xml  | 2 +-
 yuthon_approval/wizard/approval_refuse_wizard.py         | 7 +++++--
 yuthon_approval/wizard/approval_refuse_wizard_views.xml  | 2 +-
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/yuthon_approval/models/inherit_approval_approver.py b/yuthon_approval/models/inherit_approval_approver.py
index 17e981f40..791412153 100644
--- a/yuthon_approval/models/inherit_approval_approver.py
+++ b/yuthon_approval/models/inherit_approval_approver.py
@@ -7,3 +7,4 @@ class ApprovalApprover(models.Model):
     _description = '审批明细'
 
     approval_notice = fields.Text(string="审批意见")
+    approval_sign = fields.Binary(string="审批签署", copy=False)
\ No newline at end of file
diff --git a/yuthon_approval/views/inherit_approval_request_views.xml b/yuthon_approval/views/inherit_approval_request_views.xml
index 23b33c3ba..cae08987a 100644
--- a/yuthon_approval/views/inherit_approval_request_views.xml
+++ b/yuthon_approval/views/inherit_approval_request_views.xml
@@ -7,6 +7,7 @@
         <field name="arch" type="xml">
             <xpath expr="//field[@name='approver_ids']/tree//field[@name='status']" position="after">
                 <field name="approval_notice"/>
+                <field name="approval_sign" widget="image" options='{"size": [80, 40]}' />
             </xpath>
             <xpath expr="//button[@name='action_cancel']" position="after">
                 <button name="print_approval_report" string="打印" type="object"
diff --git a/yuthon_approval/wizard/approval_notice_wizard.py b/yuthon_approval/wizard/approval_notice_wizard.py
index 928c947ce..2d17d8a46 100644
--- a/yuthon_approval/wizard/approval_notice_wizard.py
+++ b/yuthon_approval/wizard/approval_notice_wizard.py
@@ -8,7 +8,7 @@ class ApprovalNoticeWizard(models.TransientModel):
 
     approval_user_line_id = fields.Many2one('approval.request', string="审批明细行")
     approval_notice_text = fields.Text(string="审批意见")
-    approval_sign = fields.Char(string="审批签署")
+    approval_sign = fields.Binary(string="审批签署", copy=False)
 
     def confirm(self):
         self.ensure_one()
@@ -16,4 +16,7 @@ class ApprovalNoticeWizard(models.TransientModel):
             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})
+        approver.write({
+            'approval_notice': self.approval_notice_text,
+            'approval_sign': self.approval_sign,
+        })
diff --git a/yuthon_approval/wizard/approval_notice_wizard_views.xml b/yuthon_approval/wizard/approval_notice_wizard_views.xml
index 5b82de80e..5559dcf23 100644
--- a/yuthon_approval/wizard/approval_notice_wizard_views.xml
+++ b/yuthon_approval/wizard/approval_notice_wizard_views.xml
@@ -9,7 +9,7 @@
                     <field name="approval_notice_text"/>
                 </group>
                 <group>
-                    <field name="approval_sign"/>
+                   <field name="approval_sign" widget="signature" options="{'size': ['',200]}"/>
                 </group>
                 <footer>
                     <button name="confirm" string="确认" type="object" class="oe_highlight"/>
diff --git a/yuthon_approval/wizard/approval_refuse_wizard.py b/yuthon_approval/wizard/approval_refuse_wizard.py
index 22a5360a9..a9b796285 100644
--- a/yuthon_approval/wizard/approval_refuse_wizard.py
+++ b/yuthon_approval/wizard/approval_refuse_wizard.py
@@ -8,7 +8,7 @@ class ApprovalRefuseWizard(models.TransientModel):
 
     approval_user_line_id = fields.Many2one('approval.request', string="审批明细行")
     approval_notice_text = fields.Text(string="审批意见")
-    approval_sign = fields.Char(string="审批签署")
+    approval_sign = fields.Binary(string="审批签署", copy=False)
 
     def confirm(self):
         self.ensure_one()
@@ -16,4 +16,7 @@ class ApprovalRefuseWizard(models.TransientModel):
             lambda approver: approver.user_id == self.env.user
         )
         self.sudo().approval_user_line_id.action_refuse(approver=approver)
-        approver.write({'approval_notice': self.approval_notice_text})
+        approver.write({
+            'approval_notice': self.approval_notice_text,
+            'approval_sign': self.approval_sign,
+        })
diff --git a/yuthon_approval/wizard/approval_refuse_wizard_views.xml b/yuthon_approval/wizard/approval_refuse_wizard_views.xml
index e45c0b3c4..318be13f9 100644
--- a/yuthon_approval/wizard/approval_refuse_wizard_views.xml
+++ b/yuthon_approval/wizard/approval_refuse_wizard_views.xml
@@ -9,7 +9,7 @@
                     <field name="approval_notice_text"/>
                 </group>
                 <group>
-                    <field name="approval_sign"/>
+                    <field name="approval_sign" widget="signature" options="{'size': ['',200]}"/>
                 </group>
                 <footer>
                     <button name="confirm" string="确认" type="object" class="oe_highlight"/>