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

!8042 添加功能

Browse Source 
Merge pull request !8042 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2026-01-16 07:31:41 +00:00
committed by Gitee
parent 3a02f3c59d 6893684ae8
commit f5c2e97585
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/models/soong_workflow_mixin.py
+3 -7
View File
@@ -129,18 +129,14 @@ class SoongWorkflowMixin(models.AbstractModel):
record.is_confirm = True
record.is_end = True
domain = [('done_by', '=', self.env.user.id), ('workflow_id', '=', record.workflow_id.id),
('res_id', '=', record.id), ('approval_state', 'in', ['0', '1']), ('name', '!=', '归档')]
('res_id', '=', record.id), ('approval_state', 'not in', ['0', '1']), ('name', '!=', '归档')]
lg2 = record.log_ids2.search(domain)
lg1 = record.log_ids.search(domain)
if lg2 or lg1:
record.is_confirm = False
if not lg1 and not lg2 and record.is_active == True:
if not lg1 and not lg2:
record.is_end = False
if record.log_ids:
if record.log_ids[-1].name == '归档' and record.log_ids[-1].approval_state == '2':
record.is_end = True
@api.depends("node_id", "log_ids")
def _compute_approval_sign_ids(self):
for record in self:
@@ -878,7 +874,7 @@ class SoongWorkflowMixin(models.AbstractModel):
id_el = etree.Element("field")
id_el.set("name", "log_ids")
id_el.set("invisible", "1")
invisible += "or is_end"
invisible += "or not is_end"
if button.name == "退回":
id_el = etree.Element("field")
id_el.set("name", "log_ids")