diff --git a/soong_workflow/models/soong_workflow_log.py b/soong_workflow/models/soong_workflow_log.py index 696630ac5..da6211b23 100644 --- a/soong_workflow/models/soong_workflow_log.py +++ b/soong_workflow/models/soong_workflow_log.py @@ -19,6 +19,7 @@ class SoongWorkflowLog(models.Model): workflow_id = fields.Many2one(comodel_name="soong.workflow") node_id = fields.Many2one(comodel_name="soong.workflow.node") + msg_id = fields.Char(string="Msg_id") node_btn_id = fields.Many2one(comodel_name="soong.workflow.node.button", string="动作名称") node_btn_name = fields.Selection([('0', ' '), ('1', '退回'), ('2', '加签'), ('3', '串'), ('4', '并'), ('5', '董事长'), ('6', '承办')], store=True, string='节点功能', default='0') done_by = fields.Many2one(comodel_name="res.users", string="审批人") @@ -78,7 +79,7 @@ class SoongWorkflowLog2(models.Model): res_id = fields.Integer(string="Related Document ID", index=True, required=True) node_id = fields.Many2one(comodel_name="soong.workflow.node") node_btn_id = fields.Many2one(comodel_name="soong.workflow.node.button", string="动作名称") - + msg_id = fields.Char(string="Msg_id") sequence = fields.Integer(string="序号", compute="_compute_sequence") done_by = fields.Many2one(comodel_name="res.users", string="审批人") name = fields.Char(string="节点名称", compute="_compute_name", store=True) diff --git a/soong_workflow/templates/soong_workflow_templates.xml b/soong_workflow/templates/soong_workflow_templates.xml index 8f4ecdd2b..efe2bd1c1 100644 --- a/soong_workflow/templates/soong_workflow_templates.xml +++ b/soong_workflow/templates/soong_workflow_templates.xml @@ -17,7 +17,7 @@ - + @@ -32,9 +32,9 @@ - + - + @@ -85,7 +85,7 @@ - + @@ -120,4 +120,91 @@ + + soong.workflow.log.kanban + soong.workflow.log + + + + + + + + + + +
+
+
+ + 节点: + +
+
+ + 状态: + +
+
+ + 经办人: + +
+
+ + 意见: + +
+
+ + 附件: + +
+
+
+
+
+
+
+
+ + soong.workflow.log2.kanban + soong.workflow.log2 + + + + + + + + +
+
+
+ + 姓名: + +
+
+ + 意见: + +
+
+ + 状态: + +
+
+ + 时间: + +
+
+
+
+
+
+
+
diff --git a/soong_workflow/views/soong_workflow_log_views.xml b/soong_workflow/views/soong_workflow_log_views.xml index 58d2f4210..f44ac9750 100644 --- a/soong_workflow/views/soong_workflow_log_views.xml +++ b/soong_workflow/views/soong_workflow_log_views.xml @@ -1,52 +1,5 @@ - - soong.workflow.log.kanban - soong.workflow.log - - - - - - - - - - -
-
-
- - 节点: - -
-
- - 状态: - -
-
- - 经办人: - -
-
- - 意见: - -
-
- - 附件: - -
-
-
-
-
-
-
-
soong.workflow.log.tree @@ -59,6 +12,7 @@ + @@ -82,6 +36,7 @@ + diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml index 91ecca53d..d3a7ec46c 100644 --- a/soong_workflow/views/soong_workflow_record.xml +++ b/soong_workflow/views/soong_workflow_record.xml @@ -176,8 +176,8 @@ -