From 741df6bfc2a87296f4ea5ccff5d0daf9e129b34b Mon Sep 17 00:00:00 2001 From: zhouzhou <123@qq.com> Date: Wed, 9 Oct 2024 20:58:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- room/__manifest__.py | 2 ++ room/data/room_meeting_type_data.xml | 24 ++++++++++++++ room/models/__init__.py | 1 + room/models/room_booking.py | 4 +-- room/models/room_meeting_type.py | 9 ++++++ room/security/ir.model.access.csv | 2 +- room/views/room_booking_views.xml | 2 +- room/views/room_meeting_type.xml | 17 ++++++++++ .../views/inherit_room_booking_views.xml | 2 ++ yuthon_work_brand/views/work_menus.xml | 31 +++++++++++++++++++ 10 files changed, 89 insertions(+), 5 deletions(-) create mode 100644 room/data/room_meeting_type_data.xml create mode 100644 room/models/room_meeting_type.py create mode 100644 room/views/room_meeting_type.xml diff --git a/room/__manifest__.py b/room/__manifest__.py index 19c2d6950..9d310b2a9 100644 --- a/room/__manifest__.py +++ b/room/__manifest__.py @@ -12,10 +12,12 @@ 'data/message_template_views.xml', 'data/room_wechat_cron_data.xml', 'data/ir_module_category_data.xml', + 'data/room_meeting_type_data.xml', 'security/ir_rule.xml', 'security/ir.model.access.csv', 'views/room_booking_views.xml', 'views/room_room_views.xml', + 'views/room_meeting_type.xml', 'views/room_menus.xml', 'views/room_booking_templates_frontend.xml', 'views/room_office_views.xml', diff --git a/room/data/room_meeting_type_data.xml b/room/data/room_meeting_type_data.xml new file mode 100644 index 000000000..28cae1a11 --- /dev/null +++ b/room/data/room_meeting_type_data.xml @@ -0,0 +1,24 @@ + + + + 党委会 + + + 班子会 + + + 董事会 + + + 培训会 + + + 临时会议 + + + 部门会议 + + + 项目会议 + + \ No newline at end of file diff --git a/room/models/__init__.py b/room/models/__init__.py index a9d0f5e47..e20d99537 100644 --- a/room/models/__init__.py +++ b/room/models/__init__.py @@ -6,3 +6,4 @@ from . import room_office from . import room_room from . import room_meeting_sign from . import inherit_calendar_event +from . import room_meeting_type diff --git a/room/models/room_booking.py b/room/models/room_booking.py index ac2e900a2..fe12d478a 100644 --- a/room/models/room_booking.py +++ b/room/models/room_booking.py @@ -34,9 +34,7 @@ class RoomBooking(models.Model): is_day = fields.Boolean(string="提前一天", default=True) meeting_type = fields.Selection([('up', '线上'), ('down', '线下'), ('exterior', '外部')], default='down', string="会议形式", required=True) - meeting_form = fields.Selection([('party', '党委会'), ('team', '班子会'), ('director', '董事会'), - ('train', '培训会'), ('temporary', '临时会议'), ('department', '部门例会'), - ('project', '项目会议')], string="会议类型",) + meeting_type_id = fields.Many2one('room.meeting.type', string="会议类型",) department_ids = fields.Many2many('hr.department', string='部门范围') employee_ids = fields.Many2many('hr.employee', string='人员范围') users_role_ids = fields.Many2many('soong.user.role', string='角色范围') diff --git a/room/models/room_meeting_type.py b/room/models/room_meeting_type.py new file mode 100644 index 000000000..dfb0b5787 --- /dev/null +++ b/room/models/room_meeting_type.py @@ -0,0 +1,9 @@ +from odoo import api, fields, models, _ +from odoo.exceptions import ValidationError + + +class RoomMeetingType(models.Model): + _name = 'room.meeting.type' + _description = '会议类型配置' + + name = fields.Char(string='名字', required=True) \ No newline at end of file diff --git a/room/security/ir.model.access.csv b/room/security/ir.model.access.csv index 7b2273907..fbb578291 100644 --- a/room/security/ir.model.access.csv +++ b/room/security/ir.model.access.csv @@ -6,6 +6,6 @@ access_room_room_manager,access.room.room.manager,room.model_room_room,room.grou access_room_booking_user,access.room.booking.user,room.model_room_booking,base.group_user,1,1,1,1 access_room_meeting_sign,access.room.meeting.sign,model_room_meeting_sign,base.group_user,1,1,1,1 - +access_room_meeting_type,access.room.meeting.type,model_room_meeting_type,base.group_user,1,1,1,1 access_room_booking_sign_wizard,room.booking.sign.wizard,model_room_booking_sign_wizard,,1,1,1,1 access_room_booking_partner_create_wizard,room.booking.partner.create.wizard,model_room_booking_partner_create_wizard,,1,1,1,1 diff --git a/room/views/room_booking_views.xml b/room/views/room_booking_views.xml index ec725cf05..71a0e89ee 100644 --- a/room/views/room_booking_views.xml +++ b/room/views/room_booking_views.xml @@ -149,7 +149,7 @@ - + diff --git a/room/views/room_meeting_type.xml b/room/views/room_meeting_type.xml new file mode 100644 index 000000000..90ca02c19 --- /dev/null +++ b/room/views/room_meeting_type.xml @@ -0,0 +1,17 @@ + + + + room_meeting_type_tree + room.meeting.type + + + + + + + + room.meeting.type + tree + + + \ No newline at end of file diff --git a/yuthon_issue/views/inherit_room_booking_views.xml b/yuthon_issue/views/inherit_room_booking_views.xml index fda2a5917..7df798e55 100644 --- a/yuthon_issue/views/inherit_room_booking_views.xml +++ b/yuthon_issue/views/inherit_room_booking_views.xml @@ -10,8 +10,10 @@ + + diff --git a/yuthon_work_brand/views/work_menus.xml b/yuthon_work_brand/views/work_menus.xml index 35d47f147..4473aa918 100644 --- a/yuthon_work_brand/views/work_menus.xml +++ b/yuthon_work_brand/views/work_menus.xml @@ -1,4 +1,5 @@ + @@ -20,8 +21,28 @@ False + + False + + + 工作台 + + + + + + + \ No newline at end of file