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

!10656 !10655 添加功能

Browse Source 
Merge pull request !10656 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-04-09 03:46:49 +00:00
committed by Gitee
parent ba9abae029 c1d9b663ec
commit 1a88dca76d
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/wizard/soong_workflow_comment_wizard.py
+21 -7
View File
@@ -563,7 +563,9 @@ class SoongWorkflowCommentWizard(models.TransientModel):
"approval_state": "0", # 待审批
})
next_node_log_records += next_node_employee_log
workflow_record_id = self.env['soong.workflow.record'].sudo().search([('code', '=', record_id.code)])
workflow_record_id = self.env['soong.workflow.record'].sudo().search([('res_id', '=', record_id.id),
('res_model', '=', record_id._name)
])
workflow_record_id.users_ids = [(4, employee.user_id.id) for employee in self.employee_ids if employee.user_id]
workflow_record_id.employee_ids = self.employee_ids.ids
workflow_record_id.approve_state = "pending" # 待审批
@@ -620,7 +622,9 @@ class SoongWorkflowCommentWizard(models.TransientModel):
user_ids = [employee.user_id.id for employee in self.employee_ids if employee.user_id]
related_record.self_users_ids = [(6, 0, user_ids)] if user_ids else [(5,)]
record_id.write({'state': self.trans_link_id.name})
workflow_record_id = self.env['soong.workflow.record'].sudo().search([('code', '=', record_id.code)])
workflow_record_id = self.env['soong.workflow.record'].sudo().search([('res_id', '=', record_id.id),
('res_model', '=', record_id._name)
])
workflow_record_id.users_ids = [(4, employee.user_id.id) for employee in self.employee_ids if
employee.user_id]
workflow_record_id.employee_ids = self.employee_ids.ids
@@ -650,7 +654,9 @@ class SoongWorkflowCommentWizard(models.TransientModel):
if self.circulated_employee_ids:
action_id = self.env['ir.actions.act_window'].search([('res_model', '=', self.res_model)])[0]
workflow_record_id = self.env['soong.workflow.record'].sudo().search([('code', '=', record_id.code)])
workflow_record_id = self.env['soong.workflow.record'].sudo().search([('res_id', '=', record_id.id),
('res_model', '=', record_id._name)
])
workflow_record_id.is_log2 = True
description = "标题: {}\n".format(record_id.name) + self.env.user.name + ' ' + str(fields.Datetime.now() + timedelta(hours=8))
workflow_record_id.employee2_ids = [(6, 0, self.circulated_employee_ids.ids)]
@@ -704,7 +710,9 @@ class SoongWorkflowCommentWizard(models.TransientModel):
"approval_state": "0",
"node_btn_id": self.node_btn_id.id,
})
workflow_record_id = self.env['soong.workflow.record'].sudo().search([('code', '=', record_id.code)])
workflow_record_id = self.env['soong.workflow.record'].sudo().search([('res_id', '=', record_id.id),
('res_model', '=', record_id._name)
])
workflow_record_id.employee_ids = self.employee_ids
action_id = self.env['ir.actions.act_window'].search([('res_model', '=', self.res_model)])[0]
related_record = self.env[self.res_model].browse(self.res_id)
@@ -792,7 +800,9 @@ class SoongWorkflowCommentWizard(models.TransientModel):
action_id = self.env['ir.actions.act_window'].search([('res_model', '=', self.res_model)])[0]
url = f'https://oa.thtzjt.com/web#id={record_id.id}&cids=2&action={action_id.id}&model={self.res_model}&view_type=from&menu_id={record_id.id}'
description = "标题: {}\n".format(record_id.name) + self.env.user.name + ' ' + str(fields.Datetime.now() + timedelta(hours=8))
workflow_record_id = self.env['soong.workflow.record'].sudo().search([('code', '=', record_id.code)])
workflow_record_id = self.env['soong.workflow.record'].sudo().search([('res_id', '=', record_id.id),
('res_model', '=', record_id._name)
])
workflow_record_id.users_ids = [(4, employee.user_id.id) for employee in self.circulated_employee_ids if employee.user_id]
workflow_record_id.employee_ids = [(4, employee.id)]
record_id = self.env[self.res_model].search([('id', '=', self.res_id)])
@@ -917,7 +927,9 @@ class SoongWorkflowCommentWizard(models.TransientModel):
if self.node_btn_name == "分发":
record_id.is_send = True
menu_id = self.env['ir.ui.menu'].search([('name', '=', '行政收文')], limit=1)
workflow_record_id = self.env['soong.workflow.record'].sudo().search([('code', '=', record_id.code)])
workflow_record_id = self.env['soong.workflow.record'].sudo().search([('res_id', '=', record_id.id),
('res_model', '=', record_id._name)
])
action_id = self.env['ir.actions.act_window'].search([('res_model', '=', self.res_model)])[0]
target_url = f'https://oa.thtzjt.com/web#id={record_id.id}&cids=2&menu_id={menu_id.id}&active_id={action_id.id}&model={record_id._name}&view_type=form'
description = "标题: {}\n".format(record_id.name) + self.env.user.name + ' ' + str(fields.Datetime.now() + timedelta(hours=8))
@@ -1051,7 +1063,9 @@ class SoongWorkflowCommentWizard(models.TransientModel):
record.log_ids[-1].write({'is_active_operate': True,
'approval_state': '1'
})
workflow_record_id = self.env['soong.workflow.record'].sudo().search([('code', '=', record_id.code)])
workflow_record_id = self.env['soong.workflow.record'].sudo().search([('res_id', '=', record_id.id),
('res_model', '=', record_id._name)
])
if not self.circulated_employee_ids:
record.log_ids[-1].write({'approval_state': '2'})
if self.document_ids: