From 82bbea2adb38154e749b93a9b46cede4820771ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Mon, 1 Jun 2026 15:24:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- soong_workflow/models/soong_workflow_mixin.py | 2 -- yuthon_hr_employee_approval/models/yuthon_retired_approval.py | 4 +++- .../views/yuthon_retired_approval_views.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py index c4e112f35..37ebcccd2 100644 --- a/soong_workflow/models/soong_workflow_mixin.py +++ b/soong_workflow/models/soong_workflow_mixin.py @@ -1648,8 +1648,6 @@ class SoongWorkflowMixin(models.AbstractModel): current_field_name = field_inst.attrib.get("name") if current_field_name in ["code", "name_title"]: field_inst.set("readonly", "1") - if field_inst.attrib.get("readonly") == "0": - field_inst.set("readonly", "0") res["arch"] = etree.tostring(arch, encoding="unicode").replace("\t", "") return res diff --git a/yuthon_hr_employee_approval/models/yuthon_retired_approval.py b/yuthon_hr_employee_approval/models/yuthon_retired_approval.py index 3fc1e3747..4deadefaf 100644 --- a/yuthon_hr_employee_approval/models/yuthon_retired_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_retired_approval.py @@ -19,7 +19,7 @@ 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(related='employee_id.retire_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='待遇选择') @@ -43,6 +43,8 @@ class YuthonRetiredApproval(models.Model): def _onchange_employee_id(self): if self.employee_id: self.name = f'关于办理{self.employee_id.name}同志退休手续的事宜' + if self.employee_id.retire_date and not self.expected_departure_date: + self.expected_departure_date = self.employee_id.retire_date def end_approval(self): current_date = fields.Date.today() 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 06c7a2474..e771828ef 100644 --- a/yuthon_hr_employee_approval/views/yuthon_retired_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_retired_approval_views.xml @@ -61,7 +61,7 @@ - +