diff --git a/yuthon_issue/models/issue_meeting_minutes.py b/yuthon_issue/models/issue_meeting_minutes.py index 5967af6c1..80d5093cd 100644 --- a/yuthon_issue/models/issue_meeting_minutes.py +++ b/yuthon_issue/models/issue_meeting_minutes.py @@ -8,12 +8,15 @@ class IssueMeetingMinutes(models.Model): _description = '会议纪要' _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] - name = fields.Char(string='名称', compute='_compute_name') number_of_meetings = fields.Integer(string='会议次数') meeting_id = fields.Many2one('room.booking', string='会议名称', required=True) meeting_type_id = fields.Many2one('room.meeting.type', string="会议类型") + users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) + department_id = fields.Many2one(related='users_id.employee_ids.department_id', string="部门") + company_id = fields.Many2one(related='users_id.employee_ids.company_id', string="公司") meeting_date = fields.Datetime(string="会议时间") + user_id = fields.Many2one('res.users', string="记录人") room_users_ids = fields.Many2many('res.users', string="出席人员") host = fields.Many2one('hr.employee', string="主持人") code = fields.Char(string='编号', required=True, copy=False, diff --git a/yuthon_issue/views/issue_meeting_minutes_views.xml b/yuthon_issue/views/issue_meeting_minutes_views.xml index fbb7e8531..aebfd4f82 100644 --- a/yuthon_issue/views/issue_meeting_minutes_views.xml +++ b/yuthon_issue/views/issue_meeting_minutes_views.xml @@ -42,8 +42,11 @@ + + + - + diff --git a/yuthon_official/views/yuthon_official_views.xml b/yuthon_official/views/yuthon_official_views.xml index fad19c2bf..c1d3185f5 100644 --- a/yuthon_official/views/yuthon_official_views.xml +++ b/yuthon_official/views/yuthon_official_views.xml @@ -26,7 +26,7 @@