Merge branch 'dev' into dev_zhou

soong_workflow/views/soong_workflow_log_views.xml

@@ -12,7 +12,6 @@
                 <!--                <field name="model"/>-->
                 <!--                <field name="res_id"/>-->
                 <field name="workflow_id" string="审批类型"/>
-                <!--                <field name="node_id" string="节点名称"/>-->
                 <field name="node_btn_id"/>
                 <field name="done_by"/>
                 <field name="lase_click_date"/>

soong_workflow/wizard/soong_workflow_comment_wizard.py

@@ -29,6 +29,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
     state_list = fields.Char(string="状态列表")
     record_id = fields.Integer()
     trans_link_id = fields.Many2one('trans.link', string='转交节点')
+    document_ids = fields.Many2many('ir.attachment', string="附件")
     return_link_id = fields.Many2one('trans.link', string='退回节点')
 
     employee_trans_domain_ids = fields.Many2many('hr.employee', 'employee_trans_domain_ids_rel', string="传阅人员", store=True)
@@ -152,6 +153,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                     "node_btn_id": self.node_btn_id.id,
                     "lase_click_date": fields.Datetime.now(),
                     "approval_state": "2",
+                    "document_ids": self.document_ids,
                     "comment": self.comment,
                 })
             else:

soong_workflow/wizard/soong_workflow_comment_wizard_view.xml

@@ -42,6 +42,7 @@
                     <field name="record_id" invisible="1"/>
                     <field name="is_automatic" invisible="1"/>
                     <field name="is_supervising" invisible="1"/>
+                    <field name="document_ids"  string="附件" widget="preview_many2many"/>
                     <!--  退回意见退回类型  -->
                     <field name="return_link_id" invisible="node_btn_name != '退回'" string="退回节点"/>
                     <!--  转交人员  -->