diff --git a/soong_workflow/views/menuitem.xml b/soong_workflow/views/menuitem.xml
index 2b5934e64..154b37ed8 100644
--- a/soong_workflow/views/menuitem.xml
+++ b/soong_workflow/views/menuitem.xml
@@ -11,7 +11,17 @@
parent="menu_soong_workflow_root"
action="action_kklw_workflow_approval_request"
sequence="1"/>
-
+
+
-
-
-
-
-
+
+
+
+
+
-
+
diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index 9e8cea20f..c03f100ad 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -331,7 +331,6 @@ class SoongWorkflowCommentWizard(models.TransientModel):
cx = self.env.context.copy() or {}
record_id = self.env[self.res_model].search([('id', '=', self.res_id)])
is_admin = self.env.user.has_group('soong_workflow.group_soong_workflow_manager')
-
if self.node_btn_name == '转交':
self_node_id = record_id.workflow_id.node_ids.search(
[('name', '=', record_id.state), ('workflow_id', '=', record_id.workflow_id.id)])
@@ -441,7 +440,6 @@ class SoongWorkflowCommentWizard(models.TransientModel):
hours=8)),
url=url, btntxt="查看详情")
# next_node_employee_log.msg_id = result_data[1]['msgid']
-
else: # 串审模式 (沿用原有逻辑)
# 查找下一个节点
next_node_id = record_id.workflow_id.node_ids.search([
@@ -468,41 +466,6 @@ class SoongWorkflowCommentWizard(models.TransientModel):
user_ids = [employee.user_id.id for employee in self.employee_ids if employee.user_id]
related_record.self_users_ids = [(6, 0, user_ids)] if user_ids else [(5,)]
record_id.write({'state': self.trans_link_id.name})
- # if self.node_btn_name == '结束':
- # # 抄送传阅日志
- # if self_node_id.is_carbon_copy:
- # for employee in self_node_id.employee_ids:
- # if not employee.wecom_userid:
- # raise ("请同步{}的企业微信".format(employee.name))
- # record_id = self.env[self.res_model].search([('id', '=', self.res_id)])
- # self.sudo().env["soong.workflow.record.copy"].create({
- # "code": record_id.code,
- # "name": record_id.name,
- # "res_model": self.res_model,
- # "workflow_id": self.node_btn_id.workflow_id.id,
- # "res_id": self.res_id,
- # "done_by": employee.user_id.id,
- # "approval_state_copy": "0",
- # })
- # self.sudo().env["soong.workflow.log2"].create({
- # "model": self.res_model,
- # "res_id": self.res_id,
- # "node_id": self.node_btn_id.node_id.id,
- # "workflow_id": self.node_btn_id.workflow_id.id,
- # "done_by": employee.user_id.id,
- # "node_btn_id": self.node_btn_id.id,
- # "approval_state": "0",
- # })
- # url = f'https://oa.thtzjt.com/web#id={self.id}&cids=2&action={record_id.action.id}&model={self.res_model}&view_type=from&menu_id={record_id.id}'
- # description = "标题: {}\n".format(record_id.name) + self.env.user.name + ' ' + str(
- # fields.Datetime.now() + timedelta(hours=8))
- # self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa',
- # user_id=employee.wecom_userid,
- # title=record_id._description + "传阅/抄送",
- # description=description, url=url,
- # btntxt="查看详情")
- # self.env['soong.workflow.record'].search([('code', '=', record_id.code)]).write({'approve_state': 'pending'})
- # return self.node_btn_id.with_context(cx).run()
for employee in self.circulated_employee_ids:
record_id = self.env[self.res_model].search([('id', '=', self.res_id)])
self.sudo().env["soong.workflow.record.copy"].create({
@@ -554,7 +517,6 @@ class SoongWorkflowCommentWizard(models.TransientModel):
if hasattr(related_record, 'self_users_ids'):
related_record.self_users_ids = [(6, 0, user_ids)] if user_ids else [(5,)]
workflow_record_id.users_ids = [(6, 0, user_ids)]
-
if self.node_btn_name == '结束':
current_user = self.env.user
current_datetime = fields.Datetime.now()
@@ -759,6 +721,14 @@ class SoongWorkflowCommentWizard(models.TransientModel):
record.write({'state': log_ids[-2].name, 'work_end': False})
return self.node_btn_id.with_context(cx).run()
+ if self.node_btn_name != "收回":
+ menu_id = self.env.ref("soong_workflow.menu_soong_workflow_todo_record_first").id
+ return {
+ "type": "ir.actions.client",
+ "tag": "reload",
+ "params": {"menu_id": menu_id,}
+ }
+
def update_self_users_ids(self):
related_record = self.env[self.res_model].browse(self.res_id)