From 29767ae1e06ed31fd82cb82aa0aeeb12de4a36a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Sat, 7 Feb 2026 20:54:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_hr_attendance/models/yuthon_vacation_reports.py | 7 ++++--- .../views/yuthon_vacation_reports_views.xml | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py index 7adc2a9eb..2c8e95902 100644 --- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py +++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py @@ -1649,9 +1649,9 @@ class VacationOverline(models.Model): is_initial_number = fields.Boolean(string="初始额度") overtime_name = fields.Char(string="标题", compute="_compute_overtime", store=True) - reason_application = fields.Text(string="事由", compute="_compute_overtime", default=None, store=True) - meal = fields.Selection([('yes', '是'), ('no', '否')], string="误餐费", compute="_compute_overtime", default=None, store=True) - workflow_id = fields.Many2one(relate = 'workflow_record_id.workflow_id', string = '审批类型', store=True) + reason_application = fields.Text(string="事由", compute="_compute_overtime", store=True) + meal = fields.Selection([('yes', '是'), ('no', '否')], string="误餐费", compute="_compute_overtime", store=True) + workflow_id = fields.Many2one('soong.workflow', compute="_compute_overtime", string='审批类型', store=True) start_time = fields.Datetime(string="开始时间", compute="_compute_overtime", store=True) end_time = fields.Datetime(string="结束时间", compute="_compute_overtime", store=True) carry_forward_date = fields.Date(string="结转日期") @@ -1795,6 +1795,7 @@ class VacationOverline(models.Model): rec.start_time = overtime_id.start_time or '' rec.end_time = overtime_id.end_time or '' rec.duration = overtime_id.duration or 0 + rec.workflow_id = rec.workflow_record_id.workflow_id.id or False def action_void(self): self.is_void = True diff --git a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml index 906d4be8e..ba755105d 100644 --- a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml +++ b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml @@ -633,9 +633,9 @@ - - - + + +