diff --git a/room/models/room_booking.py b/room/models/room_booking.py index f3cb55bda..3a24d2d9d 100644 --- a/room/models/room_booking.py +++ b/room/models/room_booking.py @@ -53,6 +53,17 @@ class RoomBooking(models.Model): # 关联流程 relevancy_type = fields.Selection([('none', '无')], string="关联流程类型") + #打开选择范围弹窗 + def open_select_range_wizard(self): + return { + 'name': '选择范围', + 'type': 'ir.actions.act_window', + 'view_mode': 'form', + 'res_model': 'room.select.range.wizard', + 'target': 'new', + 'context': {'default_room_booking_id': self.id}, + } + @api.model_create_multi def create(self, vals_list): bookings = super(RoomBooking, self).create(vals_list) diff --git a/room/views/room_booking_views.xml b/room/views/room_booking_views.xml index ccb999efe..57a795ab6 100644 --- a/room/views/room_booking_views.xml +++ b/room/views/room_booking_views.xml @@ -152,7 +152,10 @@ - +
+ +
+ @@ -162,7 +165,6 @@ - diff --git a/yuthon_issue/models/inherit_room_booking.py b/yuthon_issue/models/inherit_room_booking.py index aeb4a1e37..c90acaff0 100644 --- a/yuthon_issue/models/inherit_room_booking.py +++ b/yuthon_issue/models/inherit_room_booking.py @@ -7,14 +7,4 @@ class RoomBooking(models.Model): room_booking_library_ids = fields.One2many('issue.library', 'room_booking_id') decision_results = fields.Selection([('agree', '通过'), ('disagree', '未通过')], string="决策结果") - select_range_id = fields.Many2one('room.select.range.wizard', string="选择人员范围") - def open_select_range_wizard(self): - return { - 'name': '选择范围', - 'type': 'ir.actions.act_window', - 'view_mode': 'form', - 'res_model': 'room.select.range.wizard', - 'target': 'new', - 'context': {'default_room_booking_id': self.id}, - } diff --git a/yuthon_issue/views/inherit_room_booking.xml b/yuthon_issue/views/inherit_room_booking.xml index f4e1e1b86..be17502a0 100644 --- a/yuthon_issue/views/inherit_room_booking.xml +++ b/yuthon_issue/views/inherit_room_booking.xml @@ -19,11 +19,6 @@
- -
- -
-