From dab0bece34d231b5f26d0a03417bf170dbe38845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Fri, 18 Oct 2024 18:22:42 +0800 Subject: [PATCH] pengyuthon --- room/models/room_booking.py | 4 ++-- yuthon_issue/models/inherit_room_booking.py | 2 +- yuthon_issue/models/issue_approval.py | 7 ++++--- yuthon_issue/models/issue_library.py | 8 ++++---- yuthon_issue/views/issue_approval_views.xml | 8 +++----- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/room/models/room_booking.py b/room/models/room_booking.py index 122f30917..bcd030d7d 100644 --- a/room/models/room_booking.py +++ b/room/models/room_booking.py @@ -116,12 +116,12 @@ class RoomBooking(models.Model): if depart.child_ids: for child in depart.child_ids: department_child_users_data = users.env['hr.employee'].search( - [('department_id', '=', child.id.origin)]) + [('department_id', '=', child.id)]) department_users_list += [de.user_id.id for de in department_child_users_data] employee_users_list = users.employee_ids.user_id.ids if users.users_role_ids: for user_id in users.users_role_ids: - user_role_data = users.env['hr.employee'].search(['|', ('user_role_id', '=', user_id.id.origin), ('user_role_ids', '=', user_id.id.origin)]) + user_role_data = users.env['hr.employee'].search(['|', ('user_role_id', '=', user_id.id), ('user_role_ids', '=', user_id.id)]) users_role_list = [ro.user_id.id for ro in user_role_data] publish_user_list = department_users_list + employee_users_list + users_role_list false_none_list = [x for x in publish_user_list if x != False] diff --git a/yuthon_issue/models/inherit_room_booking.py b/yuthon_issue/models/inherit_room_booking.py index fa9c5c10e..8ce61dbec 100644 --- a/yuthon_issue/models/inherit_room_booking.py +++ b/yuthon_issue/models/inherit_room_booking.py @@ -11,7 +11,7 @@ class InheritRoomBooking(models.Model): _inherit = 'room.booking' room_booking_library_ids = fields.One2many('issue.library', 'room_booking_id') - room_details_id = fields.Many2one('issue.approval', string="议题审批") + issue_approval_id = fields.Many2one('issue.approval', string="议题审批") decision_results = fields.Selection([('agree', '通过'), ('disagree', '未通过')], string="决策结果") @api.model_create_multi diff --git a/yuthon_issue/models/issue_approval.py b/yuthon_issue/models/issue_approval.py index 37a5399bc..e125d79e0 100644 --- a/yuthon_issue/models/issue_approval.py +++ b/yuthon_issue/models/issue_approval.py @@ -19,9 +19,6 @@ class IssueApproval(models.Model): create_time = fields.Date(string='创建日期', default=lambda self: fields.Date.today()) user_id = fields.Many2one('res.users', string="经办人", default=lambda self: self.env.user) - issue_library_ids = fields.One2many('issue.library', 'issue_approval_id', string="关联议题") - approval_decision_ids = fields.One2many('issue.approval.decision', 'issue_approval_id', string="决策清单") - agenda_items = fields.Char(string="议题事项", compute='_compute_agenda_items') decision_checklist = fields.Char(string="决策清单", compute='_compute_decision_checklist') meeting_details = fields.Char(string="会议详情") @@ -29,6 +26,10 @@ class IssueApproval(models.Model): is_attend = fields.Boolean(string="是否上会", default=True) issue_text = fields.Html(string="正文") notice_documents_ids = fields.Many2many('ir.attachment', string='议题附件') + approval_decision_id = fields.Many2one('issue.approval.decision', string="关联决策清单") + + issue_library_ids = fields.One2many('issue.library', 'issue_approval_id', string="关联议题") + approval_decision_ids = fields.One2many('issue.approval.decision', 'issue_approval_id', string="决策清单") room_details_ids = fields.One2many('room.booking', 'issue_approval_id', string="会议室详情") @api.depends('issue_library_ids') diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py index 2e97d1aed..85e15ac4c 100644 --- a/yuthon_issue/models/issue_library.py +++ b/yuthon_issue/models/issue_library.py @@ -43,9 +43,9 @@ class IssueLibrary(models.Model): # self.json_display = False def issue_pull(self): - # for record in self: - # if record.state in ['approval', 'cancel']: - # raise UserError("当前状态不允许提交") + for record in self: + if record.state in ['approval', 'cancel']: + raise UserError("当前状态不允许提交") form_id = self.env.ref("yuthon_issue.issue_library_approval_form").id approval_decision_ids = [i.issue_approval_decision_id.id for i in self.issue_library_line_ids] self.write({"state": "approval"}) @@ -103,7 +103,7 @@ class IssueLibrary(models.Model): class IssueLibraryLine(models.Model): _name = "issue.library.line" - _description = '议题明细' + _description = '决策清单' issue_library_id = fields.Many2one('issue.library') issue_approval_decision_id = fields.Many2one('issue.approval.decision', string="决策清单") diff --git a/yuthon_issue/views/issue_approval_views.xml b/yuthon_issue/views/issue_approval_views.xml index 9d19bff9c..313519d15 100644 --- a/yuthon_issue/views/issue_approval_views.xml +++ b/yuthon_issue/views/issue_approval_views.xml @@ -65,11 +65,10 @@ - - + + - - + @@ -81,7 +80,6 @@ -