From 5d5d9de8028d796fe0d6affe14ff1aaeb77a56dd Mon Sep 17 00:00:00 2001
From: ljmwkx <1340053001@qq.com>
Date: Fri, 20 Dec 2024 19:06:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E5=A2=9E=E5=8A=A0=20?=
=?UTF-8?q?=E7=BB=8F=E5=8A=9E=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
soong_workflow/models/soong_workflow_mixin.py | 2 ++
soong_workflow/models/soong_workflow_record.py | 1 +
soong_workflow/views/soong_workflow_record.xml | 1 +
3 files changed, 4 insertions(+)
diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py
index 8f103a35a..3dd9fee2a 100644
--- a/soong_workflow/models/soong_workflow_mixin.py
+++ b/soong_workflow/models/soong_workflow_mixin.py
@@ -329,6 +329,7 @@ class SoongWorkflowMixin(models.AbstractModel):
"res_id": rec.id,
"workflow_id": rec.workflow_id.id,
"node_id": rec.node_id.id,
+ "done_by": self.env.uid,
"users_ids": [(4, current_user_id)],
})
user_ids_list = []
@@ -337,6 +338,7 @@ class SoongWorkflowMixin(models.AbstractModel):
user_ids_list.append((4, employee.user_id.id))
record_obj.update({"workflow_id": rec.workflow_id.id,
"node_id": rec.node_id.id,
+ "done_by": self.env.uid,
"users_ids": user_ids_list,
})
diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py
index 5ac9b20e0..6c91e8008 100644
--- a/soong_workflow/models/soong_workflow_record.py
+++ b/soong_workflow/models/soong_workflow_record.py
@@ -28,6 +28,7 @@ class SoongWorkflowRecord(models.Model):
node_id = fields.Many2one(comodel_name="soong.workflow.node", string="当前节点")
approve_state = fields.Selection([("start", "开始"), ("pending", "审批中"), ("end", "结束")], default="start", string="审批状态", compute="_compute_node_id")
reclaim_state = fields.Boolean(string="回收")
+ done_by = fields.Many2one(comodel_name="res.users", string="经办人")
def reclaim_record(self):
for rec in self:
diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml
index 679f05f37..f7f3a87c8 100644
--- a/soong_workflow/views/soong_workflow_record.xml
+++ b/soong_workflow/views/soong_workflow_record.xml
@@ -23,6 +23,7 @@
+