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

Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang

Browse Source
This commit is contained in:
李鹏宇
2026-02-03 21:22:00 +08:00
parent 74a4500177 5b2334327f
commit 5eb4f76c0c
3 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_issue/models/inherit_room_booking.py
+6
View File
@@ -102,6 +102,12 @@ class RoomBooking(models.Model):
for line in main_record.issue_meeting_line_ids:
if not line.issue_library_id:
continue
existing_line = self.env['issue.library.room.line'].search([
('issue_library_id', '=', line.issue_library_id.id),
('room_booking_id', '=', main_record.id),
], limit=1)
if existing_line:
continue
self.env['issue.library.room.line'].create({
'issue_library_id': line.issue_library_id.id,
'room_booking_id': main_record.id,
yuthon_issue/models/issue_library.py
+11
View File
@@ -812,3 +812,14 @@ class IssueLibraryRoomLine(models.Model):
room_id = fields.Many2one('room.room', string="会议地点")
meeting_type_id = fields.Many2one('room.meeting.type', string="会议类型")
approval_date = fields.Datetime(string="创建日期")
def open_record(self):
self.ensure_one()
return {
'type': 'ir.actions.act_window',
'res_model': 'room.booking',
'res_id': self.room_booking_id.id,
'view_mode': 'form',
'target': 'current',
}
yuthon_issue/views/issue_library_views.xml
+8 -4
View File
@@ -237,6 +237,7 @@
<page string="关联会议">
<field name="issue_library_room_line_ids">
<tree>
<button name="open_record" type="object" string="详情" class="oe_highlight"/>
<field name="issue_library_id" column_invisible="1"/>
<field name="room_booking_id"/>
<field name="room_id"/>
@@ -310,7 +311,7 @@
<field name="company_id" optional="hide"/>
<button name="single_meeting_issue" string="上会" type="object" class="oe_highlight" invisible="issue_state != 'will'"/>
<button name="meeting_record" string="会议详情" type="object" class="oe_highlight" invisible="issue_state not in ['meeting', 'on_meet']"/>
<button name="correction" string="修正" type="object" class="oe_highlight"/>
<button name="correction" string="修正提醒" type="object" class="oe_highlight"/>
<button name="issue_cancel" string="取消" type="object" class="oe_highlight"/>
<button name="unlink" string="删除" type="object" class="oe_highlight"/>
</tree>
@@ -342,7 +343,7 @@
<field name="company_id" optional="hide"/>
<button name="single_meeting_issue" string="上会" type="object" class="oe_highlight" invisible="issue_state != 'will'"/>
<button name="meeting_record" string="会议详情" type="object" class="oe_highlight" invisible="issue_state not in ['meeting', 'on_meet']"/>
<button name="correction" string="修正" type="object" class="oe_highlight"/>
<button name="correction" string="修正提醒" type="object" class="oe_highlight"/>
<button name="issue_cancel" string="取消" type="object" class="oe_highlight"/>
<button name="unlink" string="删除" type="object" class="oe_highlight"/>
</tree>
@@ -441,6 +442,7 @@
<page string="关联会议">
<field name="issue_library_room_line_ids" readonly="1">
<tree>
<button name="open_record" type="object" string="详情" class="oe_highlight"/>
<field name="issue_library_id" column_invisible="1"/>
<field name="room_booking_id"/>
<field name="room_id"/>
@@ -502,7 +504,7 @@
<field name="company_id" optional="hide"/>
<button name="single_meeting_issue" string="上会" type="object" class="oe_highlight" invisible="issue_state != 'will'"/>
<button name="meeting_record" string="会议详情" type="object" class="oe_highlight" invisible="issue_state not in ['meeting', 'on_meet']"/>
<button name="correction" string="修正" type="object" class="oe_highlight"/>
<button name="correction" string="修正提醒" type="object" class="oe_highlight"/>
<button name="issue_cancel" string="取消" type="object" class="oe_highlight"/>
<button name="unlink" string="删除" type="object" class="oe_highlight"/>
</tree>
@@ -599,6 +601,7 @@
<page string="关联会议">
<field name="issue_library_room_line_ids" readonly="1">
<tree>
<button name="open_record" type="object" string="详情" class="oe_highlight"/>
<field name="issue_library_id" column_invisible="1"/>
<field name="room_booking_id"/>
<field name="room_id"/>
@@ -650,7 +653,7 @@
<field name="company_id" optional="hide"/>
<button name="single_meeting_issue" string="上会" type="object" class="oe_highlight" invisible="issue_state != 'will'"/>
<button name="meeting_record" string="会议详情" type="object" class="oe_highlight" invisible="issue_state not in ['meeting', 'on_meet']"/>
<button name="correction" string="修正" type="object" class="oe_highlight"/>
<button name="correction" string="修正提醒" type="object" class="oe_highlight"/>
<button name="issue_cancel" string="取消" type="object" class="oe_highlight"/>
<button name="unlink" string="删除" type="object" class="oe_highlight"/>
</tree>
@@ -747,6 +750,7 @@
<page string="关联会议">
<field name="issue_library_room_line_ids" readonly="1">
<tree>
<button name="open_record" type="object" string="详情" class="oe_highlight"/>
<field name="issue_library_id" column_invisible="1"/>
<field name="room_booking_id"/>
<field name="room_id"/>