@@ -283,6 +283,7 @@ class SoongWorkflowMixin(models.AbstractModel):
|
||||
self.env['trans.link'].search([]).unlink()
|
||||
# 退回节点根据日志进行判断
|
||||
if btn_rec.name == '退回':
|
||||
trans_link_ids = []
|
||||
for ret in self.log_ids.search([('approval_state', '=', '2'), ('res_id', '=', self.id), ('node_btn_name', '=', '0')]):
|
||||
if not self.env['trans.link'].search([('name', '=', ret.name)]):
|
||||
self.env['trans.link'].create({
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
<p>确认要收回吗?</p>
|
||||
<sheet>
|
||||
<group>
|
||||
<field name="res_id"/>
|
||||
<field name="res_model"/>
|
||||
<field name="res_id" invisible="1"/>
|
||||
<field name="res_model" invisible="1"/>
|
||||
</group>
|
||||
</sheet>
|
||||
<footer>
|
||||
|
||||
@@ -316,7 +316,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
|
||||
("approval_state", "!=", "2")
|
||||
])
|
||||
all_completed = len(completed_logs) == 0
|
||||
if all_completed or record_id.state=='申请人' or record_id.state=='拟办':
|
||||
if all_completed:
|
||||
for employee in expected_employees:
|
||||
# 检查该员工在下一节点是否已有记录
|
||||
next_node_employee_log = self.sudo().env["soong.workflow.log"].search([
|
||||
|
||||
Reference in New Issue
Block a user