diff --git a/room/models/room_booking.py b/room/models/room_booking.py index aff397290..1b202b8e1 100644 --- a/room/models/room_booking.py +++ b/room/models/room_booking.py @@ -36,6 +36,7 @@ class RoomBooking(models.Model): required=True) meeting_type_id = fields.Many2one('room.meeting.type', string="会议类型") room_users_ids = fields.Many2many('res.users', string="出席人员") + room_users_names = fields.Char(string="出席人员char", compute="_compute_room_users", store=True) other_company_id = fields.Many2one('res.partner', string="外部公司") host = fields.Many2one('res.users', string="主持人") stationed_group = fields.Boolean(string="驻组参会") @@ -55,6 +56,12 @@ class RoomBooking(models.Model): # 关联流程 relevancy_type = fields.Selection([('none', '无')], string="关联流程类型") + @api.depends('room_users_ids') + def _compute_room_users(self): + for i in self: + employee_list = [rec.name for rec in i.room_users_ids] + i.room_users_names = ','.join(employee_list) + @api.onchange('meeting_type_id') def _onchange_meeting_type_id(self): if self.meeting_type_id: diff --git a/room/views/room_booking_views.xml b/room/views/room_booking_views.xml index bc3e9aea2..3ec4e99fa 100644 --- a/room/views/room_booking_views.xml +++ b/room/views/room_booking_views.xml @@ -32,6 +32,8 @@ string="Bookings" plan="0"> + +
    @@ -44,18 +46,10 @@ -
  • +
  • 参会人员: +
  • -
  • - 出席人员: - - - , - - - -
diff --git a/yuthon_will_task/__init__.py b/yuthon_will_task/__init__.py index c536983e2..9a7e03ede 100644 --- a/yuthon_will_task/__init__.py +++ b/yuthon_will_task/__init__.py @@ -1,2 +1 @@ -from . import models -from . import wizard \ No newline at end of file +from . import models \ No newline at end of file diff --git a/yuthon_will_task/__manifest__.py b/yuthon_will_task/__manifest__.py index e07d5a4ee..b1bf9d8b0 100644 --- a/yuthon_will_task/__manifest__.py +++ b/yuthon_will_task/__manifest__.py @@ -15,7 +15,6 @@ 'views/yuthon_will_task_views.xml', 'views/yuthon_task_time_views.xml', 'views/yuthon_task_menu.xml', - 'wizard/task_room_wizard.xml', ], 'assets': { 'web.assets_backend': [ diff --git a/yuthon_will_task/security/ir.model.access.csv b/yuthon_will_task/security/ir.model.access.csv index ff343d39d..6761eb5e7 100644 --- a/yuthon_will_task/security/ir.model.access.csv +++ b/yuthon_will_task/security/ir.model.access.csv @@ -1,7 +1,6 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_yuthon_task_time,yuthon_task_time,model_yuthon_task_time,yuthon_will_task.group_yuthon_will_task_user,1,1,1,1 access_yuthon_will_task,yuthon_will_task,model_yuthon_will_task,yuthon_will_task.group_yuthon_will_task_user,1,1,1,1 -access_task_room_wizard,task_room_wizard,model_task_room_wizard,yuthon_will_task.group_yuthon_will_task_user,1,1,1,1 diff --git a/yuthon_will_task/security/yuthon_will_task_security.xml b/yuthon_will_task/security/yuthon_will_task_security.xml index cfb9b40bc..d8e1b26a8 100644 --- a/yuthon_will_task/security/yuthon_will_task_security.xml +++ b/yuthon_will_task/security/yuthon_will_task_security.xml @@ -5,11 +5,11 @@ 日程组 - 日程用户 + 日程-用户 - 日程组管理员 + 日程-管理员 diff --git a/yuthon_will_task/static/src/js/task_create_button.js b/yuthon_will_task/static/src/js/task_create_button.js index 30d70e0b9..039452190 100644 --- a/yuthon_will_task/static/src/js/task_create_button.js +++ b/yuthon_will_task/static/src/js/task_create_button.js @@ -10,12 +10,12 @@ export class CustomTaskListController extends ListController { openTaskForm() { this.actionService.doAction({ type: 'ir.actions.act_window', - res_model: 'task.room.wizard', + res_model: 'yuthon.will.task', name: '日程会议', view_mode: 'form', view_type: 'form', views: [[false, 'form']], - target: 'new', + target: 'current', context: {}, }); } @@ -27,7 +27,7 @@ export class CustomTaskListController extends ListController { view_mode: 'form', view_type: 'form', views: [[false, 'form']], - target: 'new', + target: 'current', context: {}, }); } diff --git a/yuthon_will_task/wizard/__init__.py b/yuthon_will_task/wizard/__init__.py deleted file mode 100644 index 0baeab723..000000000 --- a/yuthon_will_task/wizard/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import task_room_wizard diff --git a/yuthon_will_task/wizard/task_room_wizard.py b/yuthon_will_task/wizard/task_room_wizard.py deleted file mode 100644 index 23b343b2d..000000000 --- a/yuthon_will_task/wizard/task_room_wizard.py +++ /dev/null @@ -1,25 +0,0 @@ -from odoo import api, fields, models - - -class TaskRoomWizard(models.Model): - _name = 'task.room.wizard' - _description = '安排日程会议弹窗' - - def create_will_task(self): - form_id = self.env.ref('yuthon_will_task.view_yuthon_will_task_form').id - return { - "type": "ir.actions.act_window", - "name": "日程安排", - "res_model": "yuthon.will.task", - "views": [[form_id, "form"]], - } - - def create_room(self): - form_id = self.env.ref('room.room_booking_view_form').id - return { - "type": "ir.actions.act_window", - "name": "会议安排", - "res_model": "room.booking", - "views": [[form_id, "form"]], - } - diff --git a/yuthon_will_task/wizard/task_room_wizard.xml b/yuthon_will_task/wizard/task_room_wizard.xml deleted file mode 100644 index 9b26dd9ef..000000000 --- a/yuthon_will_task/wizard/task_room_wizard.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - 安排日程会议 - task.room.wizard - -
- - -