!2439 添加功能

Merge pull request !2439 from 李鹏宇/dev_zhou

soong_workflow/models/soong_workflow_record.py

@@ -33,6 +33,7 @@ class SoongWorkflowRecord(models.Model):
     node_id = fields.Many2one(comodel_name="soong.workflow.node", string="当前节点")
     approve_state = fields.Selection([("start", "草稿"), ("pending", "审批中"), ("end", "结束")], default="start", string="审批状态")
     reclaim_state = fields.Boolean(string="回收")
+
     done_by = fields.Many2one(comodel_name="res.users", string="发起人")
     is_department_record = fields.Boolean(string="是否是本部门的数据", store=False, search="_search_is_department_record")
     active = fields.Boolean(string="归档", default=True)

soong_workflow/views/menuitem.xml

@@ -26,6 +26,11 @@
                   parent="menu_soong_workflow_root"
                   action="soong_workflow_record_action_admin"
                   sequence="11"/>
+        <menuitem id="menu_workflow_approval_request_employee"
+                  name="流程监控(人力资源)"
+                  parent="menu_soong_workflow_root"
+                  action="soong_workflow_record_action_employee"
+                  sequence="12"/>
         <menuitem id="menu_soong_workflow_entrust"
                   sequence="13"
                   name="流程委托"

soong_workflow/views/soong_workflow_record.xml

@@ -115,7 +115,14 @@
 <!--            <field name="domain">[("is_department_record", "=", True)]</field>-->
             <field name="search_view_id" ref="soong_workflow_record_search"/>
         </record>
-
+        <record id="soong_workflow_record_action_employee" model="ir.actions.act_window">
+            <field name="name">流程监控(人力资源)</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">soong.workflow.record</field>
+            <field name="view_mode">tree,form</field>
+             <field name="domain">[('workflow_id.approvals_group_id.name', '=', '人力资源')]</field>
+            <field name="search_view_id" ref="soong_workflow_record_search"/>
+        </record>
         <record id="soong_workflow_record_action_reclaim" model="ir.actions.act_window">
             <field name="name">工作流回收站</field>
             <field name="type">ir.actions.act_window</field>

soong_workflow/wizard/soong_workflow_comment_wizard.py

@@ -18,6 +18,8 @@ class SoongWorkflowCommentWizard(models.TransientModel):
     log_ids = fields.Many2many(comodel_name="soong.workflow.log")
     node_btn_id = fields.Many2one(comodel_name="soong.workflow.node.button")
     node_btn_name = fields.Char(string="动作名称", related='node_btn_id.name')
+    user_id = fields.Many2one('res.users',string='用户',default=lambda self: self.env.user)
+    user_role_id = fields.Many2one('soong.user.role', string="角色", compute='_compute_user_role_id')
     node_link_len = fields.Char(string="转交2")
     is_supervising = fields.Boolean(string="是否督办")
     comment_note_id = fields.Many2one('soong.note', string="意见", default='妥否，呈领导审批')
@@ -40,6 +42,14 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                                                 string="督办人员", store=True)
     is_automatic = fields.Boolean('是否自动匹配')
 
+    @api.depends('user_id.employee_id.user_role_id')
+    def _compute_user_role_id(self):
+        for record in self:
+            if record.user_id and record.user_id.employee_ids:
+                record.user_role_id = record.user_id.employee_ids.user_role_id
+            else:
+                record.user_role_id = False
+
     @api.onchange('record_id')
     def _onchange_record_id(self):
         record_id = self.env[self.res_model].search([('id', '=', self.res_id)])

soong_workflow/wizard/soong_workflow_comment_wizard_view.xml

@@ -9,7 +9,9 @@
         <field name="arch" type="xml">
             <form string="意见">
                 <group invisible="node_btn_name in ['分发', '结束', '收回']">
-                    <field name="comment_note_id" required="node_btn_name not in ['结束', '收回']"/>
+                    <field name="comment_note_id" required="node_btn_name not in ['结束', '收回']" domain="[('note_setting_id.users_role_ids', 'in', user_role_id)]"/>
+                    <field name="user_id"/>
+                    <field name="user_role_id" invisible="1"/>
                     <field name="node_btn_id" invisible="1"/>
                     <field name="node_btn_name" invisible="1"/>
                     <field name="node_link_len" invisible="1"/>

yuthon_holiday/views/hr_leave_batch.xml

@@ -60,8 +60,6 @@
                                 <field name="is_issues" invisible="1"/>
                                 <field name="start_date" invisible="1"/>
                                 <field name="end_date" invisible="1"/>
-                            </group>
-                            <group>
                                 <field name="details" readonly="1"/>
                             </group>
                         </group>

yuthon_will_task/views/yuthon_will_task_views.xml

@@ -49,7 +49,7 @@
                 <sheet>
                     <group>
                         <group>
-                            <field name="employee_ids" widget="many2many_tags"/>
+                            <field name="employee_ids" widget="many2many_tags" options="{'no_create': True}"/>
                             <field name="task_content" required="1"/>
                             <field name="task_type"/>
                             <field name="remarks"/>