diff --git a/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py b/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py
index 8cd5100d1..196d1a82c 100644
--- a/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py
+++ b/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py
@@ -33,6 +33,8 @@ class YuthonLeavingApproval(models.Model):
urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',default='normal')
work_end = fields.Boolean(string="结束")
is_execution = fields.Boolean(string="定时任务是否已执行", default=False)
+ resignation = fields.Text(string="离职体检情况", default=False)
+ salary_line_ids = fields.One2many('leaving.salary.line', 'leaving_id', string="薪资计算")
def _get_default_name_title(self):
return self._description if self._description else self._name
@@ -64,4 +66,14 @@ class YuthonLeavingApproval(models.Model):
class HrJobType(models.Model):
_name = "hr.job.type"
- name = fields.Char(string="类别名称")
\ No newline at end of file
+ name = fields.Char(string="类别名称")
+
+
+class LeavingSalaryLine(models.Model):
+ _name = "leaving.salary.line"
+
+ leaving_id = fields.Many2one('yuthon.leaving.approval', string="关联离职申请")
+ start_date = fields.Date(string="开始日期")
+ end_date = fields.Date(string="结束日期")
+ salary = fields.Float(string="实发工资")
+ remake = fields.Char(string="备注")
\ No newline at end of file
diff --git a/yuthon_hr_employee_approval/security/ir.model.access.csv b/yuthon_hr_employee_approval/security/ir.model.access.csv
index 14c33e4af..b1490c749 100644
--- a/yuthon_hr_employee_approval/security/ir.model.access.csv
+++ b/yuthon_hr_employee_approval/security/ir.model.access.csv
@@ -57,4 +57,5 @@ access_awards_line, awards_line,model_awards_line,base.group_user,1,1,1,1
access_yuthon_employee_add,yuthon_employee_add,model_yuthon_employee_add,base.group_user,1,1,1,1
access_yuthon_pre_examination,yuthon_pre_examination,model_yuthon_pre_examination,base.group_user,1,1,1,1
access_yuthon_service_type,yuthon_service_type,model_yuthon_service_type,base.group_user,1,1,1,1
-access_yuthon_contract_type,yuthon_contract_type,model_yuthon_contract_type,base.group_user,1,1,1,1
\ No newline at end of file
+access_yuthon_contract_type,yuthon_contract_type,model_yuthon_contract_type,base.group_user,1,1,1,1
+access_leaving_salary_line,leaving_salary_line,model_leaving_salary_line,base.group_user,1,1,1,1
\ No newline at end of file
diff --git a/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml
index 0e17d70e7..9c0b4c6b3 100644
--- a/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml
@@ -97,6 +97,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+