From 694384e8b141ef27993a270da5d2028e73951cb6 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: Mon, 20 Apr 2026 18:36:13 +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_catering/models/yuthon_catering.py | 2 +- yuthon_hr_attendance/models/yuthon_holiday_statement.py | 2 +- yuthon_hr_attendance/models/yuthon_meal_line.py | 2 +- yuthon_hr_attendance/models/yuthon_overtime_line.py | 2 +- yuthon_hr_attendance/models/yuthon_vacation_reports.py | 6 +++--- yuthon_hr_employee/models/yuthon_medical_manage.py | 2 +- yuthon_hr_employee/views/yuthon_hr_employee_views.xml | 8 ++++---- yuthon_salary/models/yuthon_meal_expenses.py | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/yuthon_catering/models/yuthon_catering.py b/yuthon_catering/models/yuthon_catering.py index 3befbed8c..8ef17e7c6 100644 --- a/yuthon_catering/models/yuthon_catering.py +++ b/yuthon_catering/models/yuthon_catering.py @@ -7,7 +7,7 @@ class YuthonCatering(models.Model): _name = 'yuthon.catering' date = fields.Date(string='日期', required=True) - employee_number = fields.Char(string='序号', related='employee_id.user_number', store=True) + employee_number = fields.Char(string='序号', related='employee_id.number', store=True) week_day = fields.Char(string='星期', compute='_compute_week_day', store=True) dept_id = fields.Many2one(string='部门', comodel_name='hr.department', related='employee_id.department_id', store=True) employee_id = fields.Many2one(string='员工', comodel_name='hr.employee', required=True) diff --git a/yuthon_hr_attendance/models/yuthon_holiday_statement.py b/yuthon_hr_attendance/models/yuthon_holiday_statement.py index 172c212e0..46f479c43 100644 --- a/yuthon_hr_attendance/models/yuthon_holiday_statement.py +++ b/yuthon_hr_attendance/models/yuthon_holiday_statement.py @@ -13,7 +13,7 @@ class InheritHrLeave(models.Model): _description = '请假情况' caption = fields.Char(string="标题", compute="_compute_application_reason") - employee_number = fields.Char(string='序号', related='employee_id.user_number', store=True) + employee_number = fields.Char(string='序号', related='employee_id.number', store=True) employee_id = fields.Many2one('hr.employee', string="发起人") mobile_phone = fields.Char(related='employee_id.mobile_phone', string="手机号") entry_date = fields.Date(related='employee_id.entry_date', string="入职时间", store=True) diff --git a/yuthon_hr_attendance/models/yuthon_meal_line.py b/yuthon_hr_attendance/models/yuthon_meal_line.py index 684c3b9f6..4a64cfacb 100644 --- a/yuthon_hr_attendance/models/yuthon_meal_line.py +++ b/yuthon_hr_attendance/models/yuthon_meal_line.py @@ -10,7 +10,7 @@ class YuthonMealLine(models.Model): _description = '误餐明细' employee_id = fields.Many2one('hr.employee', string="员工") - employee_number = fields.Char(string='序号', related='employee_id.user_number', store=True) + employee_number = fields.Char(string='序号', related='employee_id.number', store=True) meal_name = fields.Char(string='标题') meal_id = fields.Many2one('vacation.meal.line', string="关联误餐额度记录") entry_date = fields.Date(related='employee_id.entry_date', string="入职时间", store=True) diff --git a/yuthon_hr_attendance/models/yuthon_overtime_line.py b/yuthon_hr_attendance/models/yuthon_overtime_line.py index 08e9bbd5b..b0319828e 100644 --- a/yuthon_hr_attendance/models/yuthon_overtime_line.py +++ b/yuthon_hr_attendance/models/yuthon_overtime_line.py @@ -11,7 +11,7 @@ class YuthonOvertimeLine(models.Model): employee_id = fields.Many2one('hr.employee', string="员工") entry_date = fields.Date(related='employee_id.entry_date', string="入职时间", store=True) - employee_number = fields.Char(string='序号', related='employee_id.user_number', store=True) + employee_number = fields.Char(string='序号', related='employee_id.number', store=True) select_month = fields.Selection([('1', '一月'), ('2', '二月'), ('3', '三月'), ('4', '四月'), ('5', '五月'), ('6', '六月'), ('7', '七月'), ('8', '八月'), ('9', '九月'), ('10', '十月'), ('11', '十一月'), diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py index f8c63b17a..4ca3f374c 100644 --- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py +++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py @@ -21,7 +21,7 @@ class YuthonVacationReports(models.Model): month_id = fields.Many2one('base.month', string='月份', compute="_compute_display_date", store=True) year_id = fields.Many2one('base.year', string='年份', compute="_compute_display_date", store=True) employee_id = fields.Many2one('hr.employee', string='员工') - employee_number = fields.Char(string='序号', related='employee_id.user_number', store=True, readonly=True) + employee_number = fields.Char(string='序号', related='employee_id.number', store=True, readonly=True) entry_date = fields.Date(related='employee_id.entry_date', string="入职时间", store=True) number_card = fields.Integer(string='补卡次数', compute="_compute_number_card") remaining_number_card = fields.Integer(string='剩余补卡次数', default=3, compute="_compute_number_card", store=True) @@ -2511,7 +2511,7 @@ class VacationOverline(models.Model): default=lambda self: str(datetime.now().year)) vacation_id = fields.Many2one('yuthon.vacation.reports', string='关联假期额度记录') employee_id = fields.Many2one('hr.employee', string='员工', compute='_compute_employee_id', store=True) - employee_number = fields.Char(string='序号', related='employee_id.user_number', store=True) + employee_number = fields.Char(string='序号', related='employee_id.number', store=True) entry_date = fields.Date(related='employee_id.entry_date', string="入职时间", store=True) department_id = fields.Many2one('hr.department', related='employee_id.department_id', string="部门") company_id = fields.Many2one('res.company', related='employee_id.company_id', string="公司") @@ -2874,7 +2874,7 @@ class VacationMealLine(models.Model): vacation_id = fields.Many2one('yuthon.vacation.reports', string='关联假期额度记录') is_filing = fields.Boolean(string="归档") - employee_number = fields.Char(string='序号', related='employee_id.user_number', store=True) + employee_number = fields.Char(string='序号', related='employee_id.number', store=True) employee_id = fields.Many2one('hr.employee', string='员工', compute='_compute_employee_id', store=True) entry_date = fields.Date(related='employee_id.entry_date', string="入职时间", store=True) department_id = fields.Many2one('hr.department', related='employee_id.department_id', string="部门", store=True) diff --git a/yuthon_hr_employee/models/yuthon_medical_manage.py b/yuthon_hr_employee/models/yuthon_medical_manage.py index b8a135d97..c2058ca72 100644 --- a/yuthon_hr_employee/models/yuthon_medical_manage.py +++ b/yuthon_hr_employee/models/yuthon_medical_manage.py @@ -9,7 +9,7 @@ class YuthonMedicalManage(models.Model): _description = '体检费管理' employee_id = fields.Many2one('hr.employee', string="员工姓名") - employee_number = fields.Char( string='序号', related='employee_id.user_number', store=True, readonly=True) + employee_number = fields.Char( string='序号', related='employee_id.number', store=True, readonly=True) start_date = fields.Date(string='开始日期') year = fields.Char(string="年份") current_year_remaining = fields.Float(string="本年剩余", compute="_compute_current_year_remaining") diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml index 918c6de40..9bc1f31dc 100644 --- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml +++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml @@ -221,8 +221,8 @@ "{'no_create': True, 'no_open': True}" - - + + @@ -512,7 +512,7 @@ decoration-info="end_comparison == 'blue'" decoration-danger="end_comparison == 'red'" decoration-warning="end_comparison == 'yellow'" - default_order="user_number asc"> + default_order="number asc">
@@ -543,7 +543,7 @@ - + diff --git a/yuthon_salary/models/yuthon_meal_expenses.py b/yuthon_salary/models/yuthon_meal_expenses.py index 9851ac63c..76b4f004a 100644 --- a/yuthon_salary/models/yuthon_meal_expenses.py +++ b/yuthon_salary/models/yuthon_meal_expenses.py @@ -8,7 +8,7 @@ class YuthonMealExpenses(models.Model): _description = '餐费' employee_id = fields.Many2one('hr.employee', string='姓名') - employee_number = fields.Char(string='序号', related='employee_id.user_number', store=True) + employee_number = fields.Char(string='序号', related='employee_id.number', store=True) card = fields.Char(string='身份证') number_breakfasts = fields.Integer(string='早餐次数', compute='_compute_catering_counts', store=True) number_lunches = fields.Integer(string='午餐次数', compute='_compute_catering_counts', store=True)