diff --git a/yuthon_hr_employee_approval/models/yuthon_retired_approval.py b/yuthon_hr_employee_approval/models/yuthon_retired_approval.py index b3ad0ce41..9ef22e9b8 100644 --- a/yuthon_hr_employee_approval/models/yuthon_retired_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_retired_approval.py @@ -19,11 +19,10 @@ class YuthonRetiredApproval(models.Model): id_number = fields.Char(related='employee_id.identification_id', string="身份证号") job_id = fields.Many2one(related='employee_id.job_id', string="岗位") onboarding_time = fields.Date(related='employee_id.entry_date', string="入职日期") - expected_departure_date = fields.Date(string="预计离职日期") + expected_departure_date = fields.Date(string="预计退休日期") retirement_type = fields.Selection([('normal', '正常退休'), ('special_job_early', '特殊工种提前退休'), ('sick', '病退')], string='退休类型') social_security_card = fields.Char(string='社保卡') treatment_choice = fields.Selection([('pension_payment', '养老金发放'), ('enterprise_annuity', '企业年金')], string='待遇选择') - account = fields.Char(string='账号') documents_ids = fields.Many2many('ir.attachment', string="附件") handover_line_ids = fields.One2many('yuthon.handover.line', 'retired_id', string="工作交接") return_line_ids = fields.One2many('yuthon.return.line', 'retired_id', string="资产归还") @@ -39,6 +38,10 @@ class YuthonRetiredApproval(models.Model): name_title = fields.Char(default=_get_default_name_title) self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) + @api.onchange('employee_id') + def _onchange_employee_id(self): + if self.employee_id: + self.name = f'关于办理{self.employee_id.name}同志退休手续的事宜' class YuthonHandoverLine(models.Model): _name = 'yuthon.handover.line' diff --git a/yuthon_hr_employee_approval/views/yuthon_retired_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_retired_approval_views.xml index 7e2e61134..9a61484bc 100644 --- a/yuthon_hr_employee_approval/views/yuthon_retired_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_retired_approval_views.xml @@ -8,7 +8,6 @@ - @@ -67,8 +66,6 @@ - - diff --git a/yuthon_property/models/property_meter_archives.py b/yuthon_property/models/property_meter_archives.py index 948af6c95..417ab7100 100644 --- a/yuthon_property/models/property_meter_archives.py +++ b/yuthon_property/models/property_meter_archives.py @@ -329,6 +329,16 @@ class MeterArchivesLine(models.Model): i.last_meter = i.meter_date i.current_meter = 0 + @api.constrains('current_read', 'last_read', 'maximum_count') + def _check_reading_consistency(self): + for record in self: + if record.last_read is not None and record.current_read is not None and record.last_read > 0: + if record.current_read < record.last_read: + if record.last_read - record.current_read >= 10000: + raise ValidationError( + f"输入错误：当前读数 {record.current_read} 必须大于上次读数 {record.last_read} " + ) + @api.onchange("yuthon_property_ids") def onchange_lessee_id(self): for record in self: diff --git a/yuthon_property/models/property_meter_water.py b/yuthon_property/models/property_meter_water.py index 2e0ce4975..fea86bb15 100644 --- a/yuthon_property/models/property_meter_water.py +++ b/yuthon_property/models/property_meter_water.py @@ -263,6 +263,16 @@ class MeterWaterLine(models.Model): i.last_meter = i.meter_date i.current_meter = 0 + @api.constrains('current_read', 'last_read', 'maximum_count') + def _check_reading_consistency(self): + for record in self: + if record.last_read is not None and record.current_read is not None and record.last_read > 0: + if record.current_read < record.last_read: + if record.last_read - record.current_read >= 10000: + raise ValidationError( + f"输入错误：当前读数 {record.current_read} 必须大于上次读数 {record.last_read} " + ) + @api.onchange("yuthon_property_ids") def onchange_lessee_id(self): for record in self: diff --git a/yuthon_property/views/property_meter_archives_views.xml b/yuthon_property/views/property_meter_archives_views.xml index 60d239418..1b54408c0 100644 --- a/yuthon_property/views/property_meter_archives_views.xml +++ b/yuthon_property/views/property_meter_archives_views.xml @@ -4,7 +4,7 @@ property.meter.archives.tree property.meter.archives - +