diff --git a/yuthon_hr_employee_approval/models/yuthon_message_login.py b/yuthon_hr_employee_approval/models/yuthon_message_login.py index 48875d0e7..115027bbc 100644 --- a/yuthon_hr_employee_approval/models/yuthon_message_login.py +++ b/yuthon_hr_employee_approval/models/yuthon_message_login.py @@ -185,7 +185,6 @@ class YuthonMessageLogin(models.Model): self.old = 0 self.sex = False - def pub_name_button(self): code_url = self.get_base_url() + "/hr/employee/create?employee_id=" + str(self.id) action = { @@ -200,6 +199,20 @@ class YuthonMessageLogin(models.Model): } return action + def return_onboard_approval(self): + return { + 'type': 'ir.actions.act_window', + 'name': "入职审批", + 'res_model': 'yuthon.onboard.approval', + 'view_mode': 'form', + 'target': 'current', + 'context': { + 'default_information_form_id': self.id, + 'default_phone': self.phone, + 'default_card': self.id_card, + } + } + class EducationalDetailsLine(models.Model): _name = 'education.details.line' diff --git a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py index 78ca95482..eb879b594 100644 --- a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py @@ -244,9 +244,3 @@ class YuthonOnboardApproval(models.Model): 'vacation_date': vacation_date, }) - @api.onchange('employee_name') - def _onchange_employee_id(self): - for record in self: - if record.employee_name: - self.name = record.employee_name + '的入职合同' - diff --git a/yuthon_hr_employee_approval/views/yuthon_message_login_views.xml b/yuthon_hr_employee_approval/views/yuthon_message_login_views.xml index 139946d98..0bdb5f6a5 100644 --- a/yuthon_hr_employee_approval/views/yuthon_message_login_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_message_login_views.xml @@ -5,6 +5,9 @@ yuthon.message.login +
+