diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py index 155d550d7..8ea045e89 100644 --- a/yuthon_issue/models/issue_library.py +++ b/yuthon_issue/models/issue_library.py @@ -109,6 +109,25 @@ class IssueLibrary(models.Model): is_push_class = fields.Boolean(string="班子推送") is_push_boss = fields.Boolean(string="董事推送") is_push_depart = fields.Boolean(string="部门推送") + is_meeting = fields.Boolean(string="已过会", compute='_compute_meeting', store=True) + + @api.depends('is_party', 'is_party_passed', 'is_class', 'is_class_passed', 'is_boss', 'is_boss_passed') + def _compute_meeting(self): + for rec in self: + rec.is_meeting = False + enabled = [] + rec.is_party and enabled.append(rec.is_party_passed == 'pass') + rec.is_class and enabled.append(rec.is_class_passed == 'pass') + rec.is_boss and enabled.append(rec.is_boss_passed == 'pass') + if enabled and all(enabled): + rec.is_meeting = True + + def all_issue_library_line_ids(self): + issue_active_ids = self.env["issue.library"].browse( + self._context.get('active_ids', self._context.get('active_id')) + ) + for record in issue_active_ids: + record._compute_meeting() def meeting_record(self): self.ensure_one() @@ -745,13 +764,6 @@ class IssueLibrary(models.Model): "res_id": record.issue_approval_id.id } - def all_issue_library_line_ids(self): - issue_active_ids = self.env["issue.library"].browse( - self._context.get('active_ids', self._context.get('active_id')) - ) - for record in issue_active_ids: - record._onchange_issue_library_line_ids() - @api.onchange('issue_library_line_ids') def _onchange_issue_library_line_ids(self): for record in self: diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml index 259aac88b..c1846ce77 100644 --- a/yuthon_issue/views/issue_library_views.xml +++ b/yuthon_issue/views/issue_library_views.xml @@ -57,6 +57,7 @@