diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index 2528be53d..8a9737777 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -72,13 +72,9 @@ class SoongWorkflowCommentWizard(models.TransientModel):
def onchange_trans_employee_ids(self):
record_id = self.env[self.res_model].search([('id', '=', self.res_id)])
for ret in self.trans_link_id:
- # if '分发' or '信息管理员' in self.trans_link_id.name:
- # self.employee_ids = record_id.users_id.employee_id
- # else:
workflow_id = self.trans_link_id.node_button_id.workflow_id
state_list = [i.node_name for i in workflow_id.node_ids]
- link_users_id = workflow_id.node_ids.search(
- [('name', '=', self.trans_link_id.name), ('workflow_id', '=', workflow_id.id)]).button_ids[0].users_role_id
+ link_users_id = workflow_id.node_ids.search([('name', '=', self.trans_link_id.name), ('workflow_id', '=', workflow_id.id)]).button_ids[0].users_role_id
next_is_automatic = workflow_id.node_ids.search([('name', '=', self.trans_link_id.name), ('workflow_id', '=', workflow_id.id)]).button_ids[0].is_automatic
# 不自动匹配
employee_user_role_ids = self.env['hr.employee'].search(['|', ('user_role_id', '=', link_users_id.id),
@@ -129,7 +125,10 @@ class SoongWorkflowCommentWizard(models.TransientModel):
"approval_state": "2"
})
else:
- now_record_obj.write({"comment": self.comment_note_id.name, "approval_state": "2", "lase_click_date": fields.Datetime.now()})
+ now_record_obj.write({"comment": self.comment_note_id.name,
+ "done_by": self.employee_ids[0].user_id,
+ "approval_state": "2",
+ "lase_click_date": fields.Datetime.now()})
# 遍历出所有的工作流路径
for next in record_id.workflow_id.link_ids:
self_link = next.name.split('-> ')[0].strip()
@@ -191,18 +190,6 @@ class SoongWorkflowCommentWizard(models.TransientModel):
description=description, url=url, btntxt="查看详情")
return self.node_btn_id.with_context(cx).run()
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)])
- # now_record_obj = self.sudo().env["soong.workflow.log"].search(
- # [("model", "=", self.res_model),
- # ("res_id", "=", self.res_id),
- # ("node_id", "=", self.node_btn_id.node_id.id),
- # ("workflow_id", "=", record_id.workflow_id.id),
- # ("node_btn_name", "=", "0"),
- # ("node_btn_id", "=", self.node_btn_id.id),
- # ], order="lase_click_date DESC", limit=1)
- # if now_record_obj:
- # now_record_obj.write({"comment": self.comment_note_id.name})
record_id.write({'state': 'start' if self.return_link_id.name in ['拟办', '申请人'] else self.return_link_id.name})
# 退回创建记录
next_node_id = record_id.workflow_id.link_ids.search(
@@ -223,4 +210,6 @@ class SoongWorkflowCommentWizard(models.TransientModel):
"lase_click_date": fields.Datetime.now(),
})
return self.node_btn_id.with_context(cx).run()
+ if self.node_btn_name == '结束':
+ record_id.log_ids[-1].approval_state = '3'
return self.node_btn_id.with_context(cx).run()
diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml b/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml
index 766ab57f9..aad1ee556 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml
@@ -8,8 +8,8 @@
form