pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/dev' into dev_zhou

Browse Source
This commit is contained in:
zhouzhou
2024-11-30 19:44:29 +08:00
parent f55bf43008 cb05e8907c
commit 16798d6cc8
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/__manifest__.py
+1
View File
@@ -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",
soong_workflow/models/soong_workflow_mixin.py
+2
View File
@@ -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):
soong_workflow/wizard/soong_workflow_comment_wizard.py
+9
View File
@@ -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})