diff --git a/yuthon_hr_employee/models/yuthon_hr_employee.py b/yuthon_hr_employee/models/yuthon_hr_employee.py index eec20a72e..af39090d4 100644 --- a/yuthon_hr_employee/models/yuthon_hr_employee.py +++ b/yuthon_hr_employee/models/yuthon_hr_employee.py @@ -26,7 +26,7 @@ class YuthonHrEmployee(models.Model): 对原模型数据的隐藏,字段的开发和添加 """ _inherit = "hr.employee" - _order = 'number asc' + _order = 'user_number asc' # name = fields.CharWithPinyin(default_export_compatible=True) user_role_ids_changed = fields.Boolean(string="xxx") # bug diff --git a/yuthon_hr_employee/models/yuthon_medical_manage.py b/yuthon_hr_employee/models/yuthon_medical_manage.py index 7c53808f9..c1ef030a6 100644 --- a/yuthon_hr_employee/models/yuthon_medical_manage.py +++ b/yuthon_hr_employee/models/yuthon_medical_manage.py @@ -9,6 +9,12 @@ 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 + ) start_date = fields.Date(string='开始日期') year = fields.Char(string="年份") current_year_remaining = fields.Float(string="本年剩余", compute="_compute_current_year_remaining") @@ -34,7 +40,9 @@ class YuthonMedicalManage(models.Model): @api.depends('this_year_quota', 'this_year_usage', 'last_year_remaining') def _compute_current_year_remaining(self): for record in self: - record.current_year_remaining = record.this_year_quota + record.last_year_remaining - record.this_year_usage + record.current_year_remaining = record.this_year_quota + record.last_year_remaining - record.this_year_usage + if record.current_year_remaining != record.remainder_the_year: + record.remainder_the_year = record.current_year_remaining def update_remainder_the_year(self): soong_ids = self.env["yuthon.medical.manage"].browse( diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml index eada8dcf6..96a37e558 100644 --- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml +++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml @@ -221,7 +221,7 @@ "{'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="entry_date asc"> + default_order="user_number asc">
diff --git a/yuthon_hr_employee/views/yuthon_medical_manage_views.xml b/yuthon_hr_employee/views/yuthon_medical_manage_views.xml index d81049f01..02640685e 100644 --- a/yuthon_hr_employee/views/yuthon_medical_manage_views.xml +++ b/yuthon_hr_employee/views/yuthon_medical_manage_views.xml @@ -4,13 +4,14 @@ yuthon.medical.manage.tree yuthon.medical.manage - +
+