diff --git a/room/models/room_booking.py b/room/models/room_booking.py index 287881da3..e467aa2bb 100644 --- a/room/models/room_booking.py +++ b/room/models/room_booking.py @@ -28,7 +28,7 @@ class RoomBooking(models.Model): office_id = fields.Many2one(related="room_id.office_id", string="Office", readonly=True, store=True) company_id = fields.Many2one(related="organizer_id.employee_id.company_id", string="Company", readonly=True, store=True) - department_id = fields.Many2one('hr.department', related='organizer_id.employee_id.department_id', string="申请人部门") + department_id = fields.Many2one('hr.department', related='organizer_id.employee_id.department_id', string="部门") is_notice = fields.Boolean(string="是否发布通知", default=True) is_hour = fields.Boolean(string="提前一小时", default=True) is_day = fields.Boolean(string="提前一天", default=True) @@ -41,21 +41,30 @@ class RoomBooking(models.Model): host = fields.Many2one('res.users', string="主持人") stationed_group = fields.Boolean(string="驻组参会") other_company_user_ids = fields.Many2many('other.meet.employee', string="其他人员") - fleet_id = fields.Many2one('fleet.vehicle', string="车辆") meeting_place = fields.Char(string="会议地点") meeting_sing_ids = fields.One2many('room.meeting.sign', 'room_booking_id', string="签到详情") meeting_data = fields.Html(string="会议说明", sanitize=False) wechat_meetingid = fields.Char("企业微信会议室ID") - + documents_ids = fields.Many2many('ir.attachment', string="会议材料附件") + is_meeting = fields.Boolean(compute="_compute_is_meeting", store=True) should_user = fields.Integer(string="应到") right_user = fields.Integer(string="实到") driver = fields.Many2one('hr.employee', string="司机") partner_ids = fields.Many2many('res.partner', string="日程安排人员") + is_this_company = fields.Boolean(string='是否为本公司', default=True) # 关联流程 relevancy_type = fields.Selection([('none', '无')], string="关联流程类型") + @api.depends('meeting_type_id') + def _compute_is_meeting(self): + for record in self: + if record.meeting_type_id: + record.is_meeting = record.meeting_type_id.name in ['党委会', '班子会', '董事会'] + else: + record.is_meeting = False + @api.depends('room_users_ids') def _compute_room_users(self): for i in self: diff --git a/room/views/room_booking_views.xml b/room/views/room_booking_views.xml index 360d67955..e9f08d850 100644 --- a/room/views/room_booking_views.xml +++ b/room/views/room_booking_views.xml @@ -143,19 +143,23 @@ - - + + + + + - + + @@ -165,7 +169,7 @@ - + @@ -179,6 +183,7 @@ + @@ -219,6 +224,9 @@