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

提交一版本 测试

Browse Source
This commit is contained in:
ljmwkx
2025-01-24 22:28:02 +08:00
parent 44524b5e74
commit cd6b970a77
2 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/models/soong_workflow_mixin.py
+1
View File
@@ -216,6 +216,7 @@ class SoongWorkflowMixin(models.AbstractModel):
("res_id", "=", self.id),
("node_id", "=", btn_rec.node_id.id),
("workflow_id", "=", btn_rec.workflow_id.id),
("node_btn_id", "=", btn_rec.id),
("node_btn_name", "=", "0")
], order="lase_click_date DESC", limit=1
)
soong_workflow/wizard/soong_workflow_comment_wizard.py
+27 -12
View File
@@ -125,8 +125,21 @@ class SoongWorkflowCommentWizard(models.TransientModel):
("node_id", "=", self_node_id.id),
("workflow_id", "=", record_id.workflow_id.id),
("node_btn_name", "=", "0"),
# ("node_btn_id", "=", record_id.node_btn_id.id),
("node_btn_id", "=", self.node_btn_id.id),
], order="lase_click_date DESC", limit=1)
if not now_record_obj:
now_record_obj = self.sudo().env["soong.workflow.log"].create(
{
"model": self.res_model,
"res_id": self.res_id,
"node_id": self_node_id.id,
"workflow_id": self.node_btn_id.workflow_id.id,
"done_by": self.env.user.id,
"node_btn_name": "0",
"node_btn_id": self.node_btn_id.id,
"lase_click_date": fields.Datetime.now(),
}
)
now_record_obj.write({"comment": self.comment_note_id.name})
if self_node_id.is_carbon_copy:
for employee in self_node_id.employee_ids:
@@ -199,17 +212,18 @@ class SoongWorkflowCommentWizard(models.TransientModel):
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_id.id),
("workflow_id", "=", record_id.workflow_id.id),
("node_btn_name", "=", "0"),
# ("node_btn_id", "=", record_id.node_btn_id.id),
], order="lase_click_date DESC", limit=1)
now_record_obj.write({"comment": self.comment_note_id.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_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})
# url = 'https://oa.thtzjt.com/mail/view?model={}&res_id={}'.format(self.res_model, self.res_id)
# for employee in self.employee_ids:
@@ -235,6 +249,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
"done_by": self.env.user.id,
"approval_state": "0",
"node_btn_name": "1",
"comment": self.comment_note_id.name,
"node_btn_id": self.node_btn_id.id,
"lase_click_date": fields.Datetime.now(),
}