From 3785f5a5567d8e83ed99bff03869942a0660406b 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: Fri, 8 May 2026 15:41:01 +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 --- .../models/yuthon_vacation_reports.py | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py index 7e5c29d16..e73a00c40 100644 --- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py +++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py @@ -29,22 +29,22 @@ class YuthonVacationReports(models.Model): department_id = fields.Many2one(related='employee_id.department_id', string="部门", store=True) open_start_time = fields.Date(related='employee_id.open_start_time',string="参加工作时间") company_old = fields.Char(related='employee_id.company_old', string="工作年限") - previous_year = fields.Float(string="上年剩余", digits=(16, 1)) # 固定值 - dynamic_previous_year = fields.Float(string="上年年假剩余d", digits=(16, 1)) # 动态值 - dynamic_remainder_year = fields.Float(string="本年年假剩余d", digits=(16, 1)) # 动态值 + previous_year = fields.Float(string="上年剩余", digits=(16, 3)) # 固定值 + dynamic_previous_year = fields.Float(string="上年年假剩余d", digits=(16, 3)) # 动态值 + dynamic_remainder_year = fields.Float(string="本年年假剩余d", digits=(16, 3)) # 动态值 valid_date = fields.Date(string="有效期至") - year_distribution = fields.Float(string="本年发放d", digits=(16, 1)) - used_this_year = fields.Float(string="本年已用d", digits=(16, 1)) - remainder_year = fields.Float(string="剩余(年假)d", digits=(16, 1), compute="_compute_remainder_year") - last_holiday = fields.Float(string="上年公休日d", digits=(16, 1)) # 固定值 - last_workday = fields.Float(string="上年工作日d", digits=(16, 1)) # 固定值 + year_distribution = fields.Float(string="本年发放d", digits=(16, 3)) + used_this_year = fields.Float(string="本年已用d", digits=(16, 3)) + remainder_year = fields.Float(string="剩余(年假)d", digits=(16, 3), compute="_compute_remainder_year") + last_holiday = fields.Float(string="上年公休日d", digits=(16, 3)) # 固定值 + last_workday = fields.Float(string="上年工作日d", digits=(16, 3)) # 固定值 valid_date1 = fields.Date(string="有效期至") - year_holiday = fields.Float(string="本年公休日d", digits=(16, 1)) - year_workday = fields.Float(string="本年工作日d", digits=(16, 1)) - year_sum = fields.Float(string="本年调休合计d", digits=(16, 1), compute="_compute_year_sum") - previous_year1 = fields.Float(string="上年剩余（补休）d", digits=(16, 1)) # 固定值 - dynamic_previous_year1 = fields.Float(string="上年补休剩余d", digits=(16, 1)) # 动态值 - this_year1 = fields.Float(string="本年补休剩余d", digits=(16, 1)) # 动态值 + year_holiday = fields.Float(string="本年公休日d", digits=(16, 3)) + year_workday = fields.Float(string="本年工作日d", digits=(16, 3)) + year_sum = fields.Float(string="本年调休合计d", digits=(16, 3), compute="_compute_year_sum") + previous_year1 = fields.Float(string="上年剩余（补休）d", digits=(16, 3)) # 固定值 + dynamic_previous_year1 = fields.Float(string="上年补休剩余d", digits=(16, 3)) # 动态值 + this_year1 = fields.Float(string="本年补休剩余d", digits=(16, 3)) # 动态值 dynamic_previous_year1_hour = fields.Float( string="上年补休剩余h", @@ -56,7 +56,7 @@ class YuthonVacationReports(models.Model): digits=(16, 1), compute='_compute_hour_fields', ) - used_this_year1 = fields.Float(string="本年已休d", digits=(16, 1)) + used_this_year1 = fields.Float(string="本年已休d", digits=(16, 3)) company_id = fields.Many2one(related="employee_id.company_id", string="公司", store=True) late_allowed = fields.Float(related="employee_id.late_allowed", string="允许迟到次数") @@ -75,21 +75,21 @@ class YuthonVacationReports(models.Model): vacation_date = fields.Date(string='日期', default=lambda self: fields.Date.today().replace(day=1)) show_date = fields.Date(string='日期', compute='_compute_display_date', store=True) display_date = fields.Char(string='日期', compute='_compute_display_date') - done_leave = fields.Float(string='年假', compute='_compute_leave', store=True, digits=(16, 1), group_operator=None) + done_leave = fields.Float(string='年假', compute='_compute_leave', store=True, digits=(16, 3), group_operator=None) done_working_overtime = fields.Float(string='加班时', compute='_compute_working_overtime', digits=(16, 1), store=True, group_operator=None) - leave = fields.Float(string='剩余年假d', compute='_compute_leave', store=True, digits=(16, 1), group_operator=None) + leave = fields.Float(string='剩余年假d', compute='_compute_leave', store=True, digits=(16, 3), group_operator=None) working_overtime = fields.Float(string='剩余补休d', compute='_compute_working_overtime', store=True, - digits=(16, 1), group_operator=None) + digits=(16, 3), group_operator=None) remain_missed_meals = fields.Float(string="剩余误餐次数", compute='_compute_meal_fee', store=True, group_operator=None) medical_fee = fields.Float(string="体检费", compute='_compute_medical_fee', store=True, group_operator=None) duty = fields.Float(string="值班", compute='_compute_duty_fee', store=True, group_operator=None) duty_off_leave = fields.Float(string='值班调休', compute='_compute_duty_fee', store=True, group_operator=None) compensatory_leave = fields.Float(string="调休d", compute='_compute_other_leave', store=True, group_operator=None) - leave_of_absence = fields.Float(string="事假d", digits=(16, 1), compute='_compute_other_leave', store=True, + leave_of_absence = fields.Float(string="事假d", digits=(16, 3), compute='_compute_other_leave', store=True, group_operator=None) - statutory_leave = fields.Float(string="加班时(法定)d", compute='_compute_other_leave', store=True, group_operator=None, digits=(16, 1)) - cop_leave = fields.Float(string='补休d', digits=(16, 1), store=True, compute='_compute_working_overtime', + statutory_leave = fields.Float(string="加班时(法定)d", compute='_compute_other_leave', store=True, group_operator=None, digits=(16, 3)) + cop_leave = fields.Float(string='补休d', digits=(16, 3), store=True, compute='_compute_working_overtime', group_operator=None) marriage_leave = fields.Float(string='婚假d', compute='_compute_other_leave', store=True, group_operator=None) maternity_leave = fields.Float(string='产假d', compute='_compute_other_leave', store=True, group_operator=None) @@ -98,11 +98,11 @@ class YuthonVacationReports(models.Model): bereavement_leave = fields.Float(string='丧假d', compute='_compute_other_leave', store=True, group_operator=None) home_visit_leave = fields.Float(string='探亲假d', compute='_compute_other_leave', store=True, group_operator=None) parents_meeting_leave = fields.Float(string='家长会假d', compute='_compute_other_leave', store=True, group_operator=None) - general_sick_leave = fields.Float(string='病假(普通)d', digits=(16, 1), compute='_compute_other_leave', store=True, group_operator=None) - hospital_sick_leave = fields.Float(string='病假(住院期)d', digits=(16, 1), compute='_compute_other_leave', store=True, group_operator=None) - recovery_sick_leave = fields.Float(string='病假(出院恢复期)d', digits=(16, 1), compute='_compute_other_leave', store=True, group_operator=None) - parental_leave = fields.Float(string='育儿假d', digits=(16, 1), compute='_compute_parental_leave', store=True, group_operator=None) - remaining_parental_leave = fields.Float(string='剩余育儿假d', digits=(16, 1), compute='_compute_parental_leave', store=True, group_operator=None) + general_sick_leave = fields.Float(string='病假(普通)d', digits=(16, 3), compute='_compute_other_leave', store=True, group_operator=None) + hospital_sick_leave = fields.Float(string='病假(住院期)d', digits=(16, 3), compute='_compute_other_leave', store=True, group_operator=None) + recovery_sick_leave = fields.Float(string='病假(出院恢复期)d', digits=(16, 3), compute='_compute_other_leave', store=True, group_operator=None) + parental_leave = fields.Float(string='育儿假d', digits=(16, 3), compute='_compute_parental_leave', store=True, group_operator=None) + remaining_parental_leave = fields.Float(string='剩余育儿假d', digits=(16, 3), compute='_compute_parental_leave', store=True, group_operator=None) exam_leave = fields.Integer(string='考试假d', compute='_compute_other_leave', store=True, group_operator=None) right_days = fields.Float(string='转正天数', group_operator=None, compute='compute_attendance_fields') internship_days = fields.Float(string='实习天数', group_operator=None)