diff --git a/yuthon_issue/models/inherit_room_booking.py b/yuthon_issue/models/inherit_room_booking.py index 2eca85187..2df2955a0 100644 --- a/yuthon_issue/models/inherit_room_booking.py +++ b/yuthon_issue/models/inherit_room_booking.py @@ -10,22 +10,12 @@ class RoomBooking(models.Model): is_issue = fields.Boolean(string="是否关联议题", default=True) issue_meeting_line_ids = fields.One2many('issue.meeting.line', 'meeting_booking_id', string="关联议题明细行") number_of_meetings = fields.Integer(string='会议次数') + employee_ids2 = fields.Many2many('hr.employee', 'room_booking_employee_rel2', 'custom_id', 'employee_id', + string='复制人员') minutes_id = fields.Many2one('issue.meeting.minutes', string='会议纪要流程') is_company = fields.Boolean(string="本公司", default=True, compute='_compute_is_company', search='_search_part_of_company') - def copy_attendees_from_previous_line(self): - for booking in self: - if not booking.issue_meeting_line_ids: - continue - lines = booking.issue_meeting_line_ids - first_line = lines[0] - attendee_ids = first_line.attendees_ids.ids or [] - for line in lines[1:]: - line.write({ - 'attendees_ids': [(6, 0, attendee_ids)] - }) - @api.onchange('meeting_type_id') def _onchange_meeting_type_id(self): if self.meeting_type_id: @@ -309,6 +299,13 @@ class IssueMeetingLine(models.Model): decision_results = fields.Selection([('agree', '通过'), ('disagree', '重新上会'), ('rejected', '驳回')], string="决策结果") decision_details = fields.Text(string="决策详情") + def copy_line(self): + for booking in self: + if not booking.meeting_booking_id.employee_ids2: + raise UserError("请添加需要复制的人员") + if booking.meeting_booking_id.employee_ids2: + booking.attendees_ids = [(6, 0, booking.meeting_booking_id.employee_ids2.ids)] + @api.onchange('issue_library_id') def onchange_issue_library_id(self): if self.issue_library_id: diff --git a/yuthon_issue/views/inherit_room_booking.xml b/yuthon_issue/views/inherit_room_booking.xml index 811c9b07a..9a3462d90 100644 --- a/yuthon_issue/views/inherit_room_booking.xml +++ b/yuthon_issue/views/inherit_room_booking.xml @@ -20,9 +20,12 @@ -