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

!1853 1

Browse Source 
Merge pull request !1853 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-03-17 06:36:54 +00:00
committed by Gitee
parent 63b1255e4e cd8af67211
commit 2f4459bb2b
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/views/soong_workflow_record.xml
+2 -1
View File
@@ -27,7 +27,8 @@
<field name="approve_state" string="审批状态"/>
<field name="users_ids" string="用户" widget="many2many_tags" optional="hide"/>
<field name="employee_ids" widget="many2many_tags" string="当前经办人"/>
<field name="done_by"/>
<!-- <field name="done_by"/>-->
<field name="create_uid"/>
<field name="write_date"/>
<field name="reclaim_state" column_invisible="1"/>
<button name="delete_record" type="object" string="删除" class="btn-primary" confirm="你确定要删除吗?"/>
soong_workflow/wizard/soong_workflow_comment_wizard.py
+5 -4
View File
@@ -199,10 +199,11 @@ class SoongWorkflowCommentWizard(models.TransientModel):
workflow_record_id.employee_ids = self.employee_ids
return self.node_btn_id.with_context(cx).run()
if self.node_btn_name == '结束':
record_id.log_ids[-1].write({"comment": self.comment_note_id.name,
"approval_state": "3",
"lase_click_date": fields.Datetime.now()})
self.env['soong.workflow.record'].search([('code', '=', record_id.code)]).write({'approve_state': 'end'})
record_id.log_ids[-1].comment = self.comment_note_id.name
record_id.log_ids[-1].approval_state = "3"
record_id.log_ids[-1].lase_click_date = fields.Datetime.now()
self.env['soong.workflow.record'].search([('code', '=', record_id.code)]).write({'approve_state': 'end',
"employee_ids": False})
if self.node_btn_name == "分发":
if self.employee_ids:
record_id.log_ids[-1].write({"comment": self.comment_note_id.name,