From c090ddc640326b28364c4a1fcf68016929a8f6b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Sat, 30 Nov 2024 15:58:19 +0800 Subject: [PATCH] pengyuthon wechat --- soong_workflow/__manifest__.py | 1 + soong_workflow/models/soong_workflow_mixin.py | 2 ++ soong_workflow/wizard/soong_workflow_comment_wizard.py | 9 +++++++++ 3 files changed, 12 insertions(+) diff --git a/soong_workflow/__manifest__.py b/soong_workflow/__manifest__.py index 9e11e45f0..8459d9f6c 100644 --- a/soong_workflow/__manifest__.py +++ b/soong_workflow/__manifest__.py @@ -11,6 +11,7 @@ "data/soong_workflow_inspector_code.xml", "data/soong_workflow_time.xml", "data/soong_user_role_data.xml", + "data/notice_template_data.xml", "security/soong_workflow_security.xml", "security/ir.model.access.csv", "views/kklw_workflow_approval_views.xml", diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py index 446deabc7..09ddd0758 100644 --- a/soong_workflow/models/soong_workflow_mixin.py +++ b/soong_workflow/models/soong_workflow_mixin.py @@ -212,6 +212,8 @@ class SoongWorkflowMixin(models.AbstractModel): description="您有新的审批单{}请及时处理".format( self.name), url=url, btntxt="详情") + partner_ids = employee_ids.user_id.partner_id.ids + self.with_context(lang=self.env.lang)._message_auto_subscribe_notify(partner_ids, 'soong_workflow.message_soong_workflow_users_data') return btn_rec.with_context(cx).run() def _add_comment(self, logs, btn_rec): diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index c8502cd3d..6aab89d8b 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -115,6 +115,8 @@ class SoongWorkflowCommentWizard(models.TransientModel): title=record_id.name + "审批抄送提醒", description="您有新的抄送提醒请及时查看", url=url, btntxt="详细信息") + partner_ids = self_node_id.employee_ids.user_id.partner_id.ids + self.with_context(lang=self.env.lang)._message_auto_subscribe_notify(partner_ids, 'soong_workflow.message_soong_workflow_users_data') # 转交逻辑--单线 if not self.node_link_len: state = self.node_btn_id.node_id.out_link_ids.name.split('-> ')[-1] @@ -128,6 +130,8 @@ class SoongWorkflowCommentWizard(models.TransientModel): title=record_id.name, description="您有新的审批单请及时处理", url=url, btntxt="详情") + partner_ids = self.employee_ids.user_id.partner_id.ids + self.with_context(lang=self.env.lang)._message_auto_subscribe_notify(partner_ids, 'soong_workflow.message_soong_workflow_users_data') return self.node_btn_id.with_context(cx).run() if self.node_btn_name == '退回': record_id.write({'state': 'start' if self.return_link_id.name == '拟办' else self.return_link_id.name}) @@ -137,6 +141,8 @@ class SoongWorkflowCommentWizard(models.TransientModel): title=record_id.name, description="您的审批单已被退回，请查看详情", url=url, btntxt="详情") + partner_ids = self.employee_ids.user_id.partner_id.ids + self.with_context(lang=self.env.lang)._message_auto_subscribe_notify(partner_ids, 'soong_workflow.message_soong_workflow_users_data') return self.node_btn_id.with_context(cx).run() # 填写审批记录 if self.node_btn_name != '加签': @@ -153,6 +159,9 @@ class SoongWorkflowCommentWizard(models.TransientModel): title=record_id.name, description="传阅审批单，请知晓", url=url, btntxt="详情") + partner_ids = self.circulated_employee_ids.user_id.partner_id.ids + self.with_context(lang=self.env.lang)._message_auto_subscribe_notify(partner_ids,'soong_workflow.message_soong_workflow_users_data') + if self.employee_ids: state = self.node_btn_id.node_id.out_link_ids.name.split('-> ')[-1] record_id.write({'state': 'end' if state == '结束' else state})