From 0f5b4a7fe7b6af6189999ef2b2910bdfacf1f777 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Mon, 14 Apr 2025 14:55:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- soong_workflow/models/soong_workflow_record.py | 1 + soong_workflow/views/menuitem.xml | 5 +++++ soong_workflow/views/soong_workflow_record.xml | 9 ++++++++- soong_workflow/wizard/soong_workflow_comment_wizard.py | 10 ++++++++++ .../wizard/soong_workflow_comment_wizard_view.xml | 4 +++- yuthon_holiday/views/hr_leave_batch.xml | 2 -- yuthon_will_task/views/yuthon_will_task_views.xml | 2 +- 7 files changed, 28 insertions(+), 5 deletions(-) diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py index 9cd4d13ff..74f0deb76 100644 --- a/soong_workflow/models/soong_workflow_record.py +++ b/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) diff --git a/soong_workflow/views/menuitem.xml b/soong_workflow/views/menuitem.xml index 00ae8b396..0222489f7 100644 --- a/soong_workflow/views/menuitem.xml +++ b/soong_workflow/views/menuitem.xml @@ -26,6 +26,11 @@ parent="menu_soong_workflow_root" action="soong_workflow_record_action_admin" sequence="11"/> + [("is_department_record", "=", True)]--> - + + 流程监控(人力资源) + ir.actions.act_window + soong.workflow.record + tree,form + [('workflow_id.approvals_group_id.name', '=', '人力资源')] + + 工作流回收站 ir.actions.act_window diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index 29597f445..68eb4bea7 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/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)]) diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml b/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml index 26e1a12d8..30fda843c 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml +++ b/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml @@ -9,7 +9,9 @@
- + + + diff --git a/yuthon_holiday/views/hr_leave_batch.xml b/yuthon_holiday/views/hr_leave_batch.xml index f09a9051f..3ea0801d4 100644 --- a/yuthon_holiday/views/hr_leave_batch.xml +++ b/yuthon_holiday/views/hr_leave_batch.xml @@ -60,8 +60,6 @@ - - diff --git a/yuthon_will_task/views/yuthon_will_task_views.xml b/yuthon_will_task/views/yuthon_will_task_views.xml index 119854d55..e29ae70ea 100644 --- a/yuthon_will_task/views/yuthon_will_task_views.xml +++ b/yuthon_will_task/views/yuthon_will_task_views.xml @@ -49,7 +49,7 @@ - +