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

添加功能

Browse Source
This commit is contained in:
李鹏宇
2025-12-12 10:26:39 +08:00
parent 84773b8e21
commit 3be3b888a6
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
room/views/room_booking_views.xml
+6 -6
View File
@@ -153,7 +153,7 @@
</group>
<group>
<group>
<field name="organizer_id"/>
<field name="organizer_id" options="{'no_create': True}"/>
<field name="meeting_type"/>
<field name="driver" invisible="meeting_type != 'exterior'"/>
<field name="fleet_id" invisible="meeting_type != 'exterior'"/>
@@ -162,14 +162,14 @@
<field name="is_this_company"/>
</group>
<group>
<field name="department_id" widget="ztree_select"/>
<field name="department_id" widget="ztree_select" options="{'no_create': True}"/>
<field name="company_id" invisible="1"/>
<field name="meeting_type_id" required="1" domain="[('company_id', '=', company_id)]"/>
<field name="meeting_type_id" required="1" domain="[('company_id', '=', company_id)]" options="{'no_create': True}"/>
</group>
</group>
<group col="4">
<group>
<field name="host" domain = "[('company_id', '=', company_id), ('user_id.name', '!=', 'Administrator')] if is_this_company else []"/>
<field name="host" domain = "[('company_id', '=', company_id), ('user_id.name', '!=', 'Administrator')] if is_this_company else []" options="{'no_create': True}"/>
</group>
<group>
<field name="stationed_group"/>
@@ -178,8 +178,8 @@
<group/>
</group>
<group>
<field name="room_users_ids" widget="many2many_tags" domain = "[('company_id', '=', company_id), ('name', '!=', 'Administrator')] if is_this_company else []"/>
<field name="other_company_user_ids" widget="many2many_tags" readonly="0"/>
<field name="room_users_ids" widget="many2many_tags" domain = "[('company_id', '=', company_id), ('name', '!=', 'Administrator')] if is_this_company else []" options="{'no_create': True}"/>
<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_will_task/models/inherit_room_booking.py
+12
View File
@@ -13,15 +13,27 @@ class InheritRoomBooking(models.Model):
for user_id in new_record.room_users_ids:
if user_id.employee_id:
employee_list.append(user_id.employee_id.id)
def get_hour_selection(datetime_obj):
if not datetime_obj:
return None
hour = datetime_obj.hour
minute = datetime_obj.minute
return str(hour) if minute == 0 else f"{hour}.5"
if task_time_ids:
start_datetime = new_record.start_datetime
start_date = start_datetime.date()
request_hour_from = get_hour_selection(new_record.start_datetime)
request_hour_to = get_hour_selection(new_record.end_datetime)
self.env['yuthon.will.task'].sudo().create({
'name': new_record.name,
'users_ids': [(6, 0, new_record.room_users_ids.ids)],
'employee_ids': [(6, 0, employee_list)],
'task_time_ids': [(6, 0, task_time_ids.ids)],
'start_date': start_date,
'request_hour_from': request_hour_from,
'request_hour_to': request_hour_to,
'address' : new_record.room_id.name,
'task_state': 'will',
})