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

添加功能

Browse Source
This commit is contained in:
李鹏宇
2026-01-13 12:22:54 +08:00
parent e68e14834a
commit ebdeae052d
2 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/models/soong_workflow_log.py
+2 -2
View File
@@ -46,8 +46,8 @@ class SoongWorkflowLog(models.Model):
def _compute_name(self):
for rec in self:
if rec.name == '归档':
pass
if rec.node_id:
rec.name = '归档'
elif rec.node_id:
rec.name = "%(node_id_name)s" % {"node_id_name": rec.node_id.name}
else:
rec.name = ""
soong_workflow/wizard/soong_workflow_comment_wizard.py
+41 -31
View File
@@ -552,17 +552,17 @@ class SoongWorkflowCommentWizard(models.TransientModel):
current_user = self.env.user
current_datetime = fields.Datetime.now()
is_admin = current_user.has_group('soong_workflow.group_soong_workflow_manager')
if is_admin:
record_id.log_ids[-1].sudo().write({
'comment': self.comment,
'approval_state': "2",
'lase_click_date': fields.Datetime.now() - timedelta(hours=8),
'document_ids': [(6, 0, self.document_ids.ids)]
})
self.env['soong.workflow.record'].search([('code', '=', record_id.code)]).write({'approve_state': 'end',
"employee_ids": False,
"node_id": False, })
record_id.work_end = True
# if is_admin:
# record_id.log_ids[-1].sudo().write({
# 'comment': self.comment,
# 'approval_state': "2",
# 'lase_click_date': fields.Datetime.now() - timedelta(hours=8),
# 'document_ids': [(6, 0, self.document_ids.ids)]
# })
# self.env['soong.workflow.record'].search([('code', '=', record_id.code)]).write({'approve_state': 'end',
# "employee_ids": False,
# "node_id": False, })
# record_id.work_end = True
if record_id.log_ids:
user_log = record_id.log_ids.filtered(lambda log: log.done_by == current_user)
if user_log:
@@ -631,26 +631,36 @@ class SoongWorkflowCommentWizard(models.TransientModel):
if all_approved and log2_ids_all_qualified:
workflow_record = self.env['soong.workflow.record'].search([('code', '=', record_id.code)],
limit=1)
if workflow_record:
workflow_record.write({
'approve_state': 'end',
'employee_ids': [(6, 0, [applicant.employee_ids.id])],
'soong_state': 'to_active',
'node_id': False,
})
log_id = record_id.log_ids.filtered(lambda l: l.comment in ['归档', '待归档'])
if not log_id:
self.env["soong.workflow.log"].create({
'name': '归档',
"code": self.code,
"model": self.res_model,
"res_id": self.res_id,
"workflow_id": self.node_btn_id.workflow_id.id,
"lase_click_date": fields.Datetime.now(),
"done_by": applicant.id,
"approval_state": "0",
"node_btn_id": self.node_btn_id.id,
})
has_archive_btn = any(btn_name.name == '归档' for btn_name in self.node_btn_id.node_id.button_ids)
if has_archive_btn:
if workflow_record:
workflow_record.write({
'approve_state': 'end',
'employee_ids': [(6, 0, [applicant.employee_ids.id])],
'soong_state': 'to_active',
'node_id': False,
})
log_id = record_id.log_ids.filtered(lambda l: l.comment in ['归档', '待归档'])
if not log_id:
self.env["soong.workflow.log"].create({
'name': '归档',
"code": self.code,
"model": self.res_model,
"res_id": self.res_id,
"workflow_id": self.node_btn_id.workflow_id.id,
"lase_click_date": fields.Datetime.now(),
"done_by": applicant.id,
"approval_state": "0",
"node_btn_id": self.node_btn_id.id,
})
else:
if workflow_record:
workflow_record.write({
'approve_state': 'end',
'employee_ids': False,
'node_id': False,
'soong_state': 'done',
})
record_id.work_end = True
# 给申请人发消息
biz_record = self.env[self.res_model].browse(self.res_id)