pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!8561 !8560 添加功能

Browse Source 
Merge pull request !8561 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-02-02 09:55:45 +00:00
committed by Gitee
parent 9ac3b3c34e 30ab1f79e6
commit ccfaebaee1
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
room/models/room_booking.py
+14 -2
View File
@@ -92,8 +92,20 @@ class RoomBooking(models.Model):
@api.onchange('meeting_type_id')
def _onchange_meeting_type_id(self):
if self.meeting_type_id:
self.room_users_ids = self.meeting_type_id.users_ids
self.host = self.meeting_type_id.host_user_id.id if self.meeting_type_id.host_user_id else False
host_role_id = self.meeting_type_id.host_id.id
host_employee = self.env['hr.employee'].search([
('user_role_ids', 'in', host_role_id),
], limit=1)
room_user_role_ids = self.meeting_type_id.room_users_ids.ids
room_employees = self.env['hr.employee'].search([
'|',
('user_role_ids', 'in', room_user_role_ids),
('user_role_id', 'in', room_user_role_ids),
('id', '!=', host_employee.id)
])
room_user_ids = room_employees.mapped('user_id.id')
self.host = host_employee.id
self.room_users_ids = [(6, 0, room_user_ids)]
else:
self.room_users_ids = [(5, 0, 0)]
self.host = False
room/views/room_booking_views.xml
+2 -2
View File
@@ -202,8 +202,8 @@
</group>
<group>
<field name="room_users_ids" widget="many2many_tags" domain = "[('company_id', '=', company_id), ('name', '!=', 'Administrator')] if is_this_company else []" options="{'no_create': True}"/>
<filed name="recorder_ids" widget="many2many_tags" domain="[('user_role_ids.name', 'ilike', '会议记录员')]"/>
<filed name="other_company_user_ids" widget="many2many_tags" readonly="0" options="{'no_create': True}"/>
<field name="recorder_ids" widget="many2many_tags" domain="[('user_role_ids.name', 'ilike', '会议记录员')]"/>
<field name="other_company_user_ids" widget="many2many_tags" readonly="0" options="{'no_create': True}"/>
<field name="partner_ids" widget="many2many_tags" force_save="1" invisible="1"/>
<field name="is_meeting" invisible="1"/>
<field name="is_notice"/>
yuthon_issue/models/issue_library.py
-11
View File
@@ -558,15 +558,6 @@ class IssueLibrary(models.Model):
break
elif passed_result == 'pass':
continue
host_role_id = meeting_type.host_id.id
host_employee = self.env['hr.employee'].search([
('user_role_ids', 'in', host_role_id),
], limit=1)
room_user_role_ids = meeting_type.room_users_ids.ids
room_employees = self.env['hr.employee'].search([
('user_role_ids', 'in', room_user_role_ids),
])
room_user_ids = room_employees.mapped('user_id.id')
form_id = self.env.ref("room.room_booking_view_form", raise_if_not_found=False)
return {
"type": "ir.actions.act_window",
@@ -576,8 +567,6 @@ class IssueLibrary(models.Model):
"context": {
'default_is_issue': True,
'default_state': '申请人',
'default_host': host_employee.id,
'default_room_users_ids': [(6, 0, room_user_ids)],
'default_meeting_type_id': target_meeting_type_id,
'default_start_datetime': fields.Datetime.now() + timedelta(hours=8),
'default_issue_meeting_line_ids': issue_details,