!47 审批 审批意见簿

Merge pull request !47 from ljm/ljm

yuthon_approval/__manifest__.py

@@ -18,6 +18,7 @@
         'views/inherit_approval_category_views.xml',
         'views/inherit_approval_request_views.xml',
         'views/approval_process_views.xml',
+        'views/approval_notice_note_views.xml',
         'report/all_demo_report.xml',
     ],
     'installable': True,

yuthon_approval/models/__init__.py

@@ -3,4 +3,5 @@ from . import inherit_approval_approver
 from . import inherit_approval_process
 from . import inherit_approval_request
 
+from . import approval_notice_note
 

yuthon_approval/models/approval_notice_note.py

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, tools, _
+from odoo.exceptions import ValidationError
+
+
+class ApprovalNoticeNote(models.Model):
+    _name = "approval.notice.note"
+    _description = "审批意见快捷"
+    _rec_name = 'name'
+
+    name = fields.Text(string="审批意见")
+
+

yuthon_approval/security/ir.model.access.csv

@@ -5,6 +5,8 @@ access_approval_other_users,approval_other_users,model_approval_other_users,base
 
 access_approval_notice_wizard,approval_notice_wizard,model_approval_notice_wizard,base.group_user,1,1,1,1
 access_approval_refuse_wizard,approval_refuse_wizard,model_approval_refuse_wizard,base.group_user,1,1,1,1
+access_approval_notice_note_users,approval_notice_note_user,model_approval_notice_note,base.group_user,1,1,1,1
+
 
 
 

yuthon_approval/views/approval_notice_note_views.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_approval_notice_note_tree" model="ir.ui.view">
+        <field name="name">approval.notice.note.tree</field>
+        <field name="model">approval.notice.note</field>
+        <field name="arch" type="xml">
+            <tree string="审批意见">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_approval_notice_note_form" model="ir.ui.view">
+        <field name="name">approval.notice.note.form</field>
+        <field name="model">approval.notice.note</field>
+        <field name="arch" type="xml">
+            <form string="审批意见">
+                <sheet>
+                    <group>
+                        <field name="name" required="1"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_approval_notice_note_action" model="ir.actions.act_window">
+        <field name="name">审批意见</field>
+        <field name="res_model">approval.notice.note</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem id="menu_approval_notice_note_view" name="审批意见" parent="approvals.approvals_menu_config" sequence="30"
+              action="view_approval_notice_note_action"/>
+</odoo>

yuthon_approval/wizard/approval_notice_wizard.py

@@ -7,7 +7,7 @@ class ApprovalNoticeWizard(models.TransientModel):
     _description = """  审批意见弹窗  """
 
     approval_user_line_id = fields.Many2one('approval.request', string="审批明细行")
-    approval_notice_text = fields.Text(string="审批意见")
+    approval_notice_text = fields.Many2one('approval.notice.note', string="审批意见")
     approval_sign = fields.Binary(string="审批签署", copy=False)
 
     def confirm(self):
@@ -17,6 +17,6 @@ class ApprovalNoticeWizard(models.TransientModel):
         )
         self.sudo().approval_user_line_id.action_approve(approver=approver)
         approver.write({
-            'approval_notice': self.approval_notice_text,
+            'approval_notice': self.approval_notice_text.name,
             'approval_sign': self.approval_sign,
         })

yuthon_approval/wizard/approval_refuse_wizard.py

@@ -7,7 +7,7 @@ class ApprovalRefuseWizard(models.TransientModel):
     _description = """  审批意见弹窗  """
 
     approval_user_line_id = fields.Many2one('approval.request', string="审批明细行")
-    approval_notice_text = fields.Text(string="审批意见")
+    approval_notice_text = fields.Many2one('approval.notice.note', string="审批意见")
     approval_sign = fields.Binary(string="审批签署", copy=False)
 
     def confirm(self):
@@ -17,6 +17,6 @@ class ApprovalRefuseWizard(models.TransientModel):
         )
         self.sudo().approval_user_line_id.action_refuse(approver=approver)
         approver.write({
-            'approval_notice': self.approval_notice_text,
+            'approval_notice': self.approval_notice_text.name,
             'approval_sign': self.approval_sign,
         })