diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py index 6a86a4cdd..315fa814f 100644 --- a/soong_workflow/models/soong_workflow_record.py +++ b/soong_workflow/models/soong_workflow_record.py @@ -31,6 +31,7 @@ class SoongWorkflowRecord(models.Model): employee_ids = fields.Many2many('hr.employee', string="当前经办人") workflow_id = fields.Many2one(comodel_name="soong.workflow", string="类型", ondelete="restrict") node_id = fields.Many2one(comodel_name="soong.workflow.node", string="当前节点") + company_id = fields.Many2one(related="create_uid.company_id", string="公司") approve_state = fields.Selection([("start", "草稿"), ("pending", "审批中"), ("end", "结束")], default="start", string="状态") reclaim_state = fields.Boolean(string="回收") approvals_group_id = fields.Many2one(related='workflow_id.approvals_group_id', string="审批分组", store=True) diff --git a/soong_workflow/security/company_rule.xml b/soong_workflow/security/company_rule.xml index 71fcd341a..4ad0b6b3c 100644 --- a/soong_workflow/security/company_rule.xml +++ b/soong_workflow/security/company_rule.xml @@ -5,10 +5,9 @@ [('company_id', 'in', company_ids)] - - - - - - + + 工作流查询多公司 + + [('company_id', 'in', company_ids)] + \ No newline at end of file diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml index d15d2f235..7bb339560 100644 --- a/soong_workflow/views/soong_workflow_record.xml +++ b/soong_workflow/views/soong_workflow_record.xml @@ -34,6 +34,7 @@ +