添加功能

2026-03-24 09:54:20 +08:00
parent 5ef1afcc00
commit b8b8b7a9a5
2 changed files with 4 additions and 2 deletions
@@ -31,7 +31,8 @@ class YuthonRenewalApproval(models.Model):
    degree = fields.Char(related='employee_id.high_degree', string="学历")
    onboard_time = fields.Date(related='employee_id.contract_id.date_of_entry', string='入职时间')
    current_status = fields.Date(string='合同到期日')
-    renewal_date = fields.Date(string="续签日期")
+    renewal_date = fields.Date(string="续签开始日期")
+    renewal_term = fields.Date(string="续签结束日期")
    contract = fields.Char(string="劳动合同签订情况")
    condition_review = fields.Text(string="续期条件审核")
    job_id = fields.Many2one('hr.job', string="续签劳动合同岗位")
@@ -62,7 +63,7 @@ class YuthonRenewalApproval(models.Model):
                if no_fixed_type:
                    new_contract_type_id = no_fixed_type.id
        new_contract_vals.update({
-            # 'date_end': self.renewal_date,
+            'date_end': self.renewal_term if self.renewal_term else False,
            'date_start': self.renewal_date,
            'state': 'open',
            'job_id': self.job_id.id,
@@ -72,6 +72,7 @@
                            <field name="degree"/>
                            <field name="onboard_time"/>
                            <field name="renewal_date"/>
+                            <field name="renewal_term"/>
                        </group>
                    </group>
                    <group string="合同信息">