diff --git a/yuthon_issue/models/inherit_room_booking.py b/yuthon_issue/models/inherit_room_booking.py index ed6da7176..4046e78a2 100644 --- a/yuthon_issue/models/inherit_room_booking.py +++ b/yuthon_issue/models/inherit_room_booking.py @@ -7,6 +7,8 @@ class RoomBooking(models.Model): is_issue = fields.Boolean(string="是否关联议题") issue_meeting_line_ids = fields.One2many('issue.meeting.line', 'meeting_booking_id', string="关联议题明细行") + number_of_meetings = fields.Integer(string='会议次数') + company_page = fields.Selection([('tz', '天河投资'), ('wg', '天河物管'), ('lc', '天河粮储')], string="公司") def bottom_meeting_approval(self): library_data = [] @@ -28,6 +30,8 @@ class RoomBooking(models.Model): 'default_meeting_id': self.id, 'default_meeting_type_id': self.meeting_type_id.id, 'default_meeting_date': self.start_datetime, + 'default_number_of_meetings': self.number_of_meetings, + 'default_company_page':self.company_page, 'default_meeting_minutes_ids': library_data }} diff --git a/yuthon_issue/models/issue_meeting_minutes.py b/yuthon_issue/models/issue_meeting_minutes.py index 06136e3a0..8ee2f945e 100644 --- a/yuthon_issue/models/issue_meeting_minutes.py +++ b/yuthon_issue/models/issue_meeting_minutes.py @@ -8,6 +8,10 @@ class IssueMeetingMinutes(models.Model): _description = '会议纪要' _inherit = ['soong.workflow.mixin'] + + name = fields.Char(string='名称') + number_of_meetings = fields.Integer(string='会议次数') + company_page = fields.Selection([('tz', '天河投资'), ('wg', '天河物管'), ('lc', '天河粮储')], string="公司") meeting_id = fields.Many2one('room.booking', string='会议名称', required=True) meeting_type_id = fields.Many2one('room.meeting.type', string="会议类型") meeting_date = fields.Datetime(string="会议时间") @@ -16,6 +20,16 @@ class IssueMeetingMinutes(models.Model): meeting_minutes_ids = fields.One2many('issue.meeting.minutes.line', 'meeting_minutes_id', string="会议纪要明细") notice_documents_ids = fields.Many2many('documents.document', string="纪要签名附件") + computed_meeting_name = fields.Char(string='会议名称', compute='_compute_meeting_name') + @api.depends('meeting_date', 'number_of_meetings', 'meeting_id.name') + def _compute_meeting_name(self): + for record in self: + if record.meeting_date and record.meeting_id: + year = record.meeting_date.year + meeting_name = record.meeting_id.name + record.computed_meeting_name = f"{meeting_name}【{year}】{record.number_of_meetings}号" + else: + record.computed_meeting_name = False class IssueMeetingMinutesLine(models.Model): _name = 'issue.meeting.minutes.line' diff --git a/yuthon_issue/report/meeting_minutes_report.xml b/yuthon_issue/report/meeting_minutes_report.xml index aa3cac755..1eea3c420 100644 --- a/yuthon_issue/report/meeting_minutes_report.xml +++ b/yuthon_issue/report/meeting_minutes_report.xml @@ -2,8 +2,49 @@ - + + + + + + + + + + + + + + + , + 天河投资集团 + 天河物管集团 + 天河粮储集团(下称“公司”)在 + (下称“会议”),召开了本年度 + 第次,会议议题如下: + + + + + + 、 + + + + + + + + + 、 + + + + + + + \ No newline at end of file diff --git a/yuthon_issue/views/inherit_room_booking.xml b/yuthon_issue/views/inherit_room_booking.xml index 24a8b8d1b..92b0172a7 100644 --- a/yuthon_issue/views/inherit_room_booking.xml +++ b/yuthon_issue/views/inherit_room_booking.xml @@ -8,6 +8,10 @@ + + + + diff --git a/yuthon_issue/views/issue_meeting_minutes_views.xml b/yuthon_issue/views/issue_meeting_minutes_views.xml index e0bd4e9a4..ea99a0a49 100644 --- a/yuthon_issue/views/issue_meeting_minutes_views.xml +++ b/yuthon_issue/views/issue_meeting_minutes_views.xml @@ -21,10 +21,15 @@ + + + + +