From b13a2af9820a798773dc96cc5cfeed91f14c811a Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Thu, 20 Mar 2025 18:08:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../models/inherit_hr_employee.py | 6 +++--- .../models/yuthon_reassignment_approval.py | 20 ++++++++----------- .../models/yuthon_regularization_approval.py | 15 +++++++------- .../views/yuthon_leaving_approval_views.xml | 2 +- .../yuthon_reassignment_approval_views.xml | 8 ++------ .../yuthon_regularization_approval_views.xml | 9 +++------ .../views/yuthon_retired_approval_views.xml | 2 +- .../views/yuthon_payroll_project_views.xml | 16 +++++++-------- 8 files changed, 33 insertions(+), 45 deletions(-) diff --git a/yuthon_hr_employee_approval/models/inherit_hr_employee.py b/yuthon_hr_employee_approval/models/inherit_hr_employee.py index 40d6ef428..a1a27f731 100644 --- a/yuthon_hr_employee_approval/models/inherit_hr_employee.py +++ b/yuthon_hr_employee_approval/models/inherit_hr_employee.py @@ -18,7 +18,7 @@ class YuthonHrEmployee(models.Model): "res_model": "yuthon.reassignment.approval", "views": [[form_id, "form"]], "context":{ - 'default_users_id':user_id.id, + 'default_employee_id':user_id.employee_id.id, } } @@ -34,7 +34,7 @@ class YuthonHrEmployee(models.Model): "res_model": "yuthon.leaving.approval", "views": [[form_id, "form"]], "context": { - 'default_employee_id':user_id.id, + 'default_employee_id':user_id.employee_id.id, } } @@ -67,7 +67,7 @@ class YuthonHrEmployee(models.Model): "res_model": "yuthon.regularization.approval", "views": [[form_id, "form"]], "context": { - 'default_employee_id':user_id.id, + 'default_employee_id':user_id.employee_id.id, } } diff --git a/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py b/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py index a40ebe2f5..f29178b66 100644 --- a/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py @@ -9,21 +9,19 @@ class YuthonReassignmentApproval(models.Model): users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) employee_id = fields.Many2one('hr.employee', string="员工姓名") - department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门") - rank = fields.Char(string='职级') + department_id = fields.Many2one(related='employee_id.department_id', string="部门") code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_reassignment_approval_code')) - phone = fields.Char(related='users_id.employee_id.work_phone',string='联系电话') + phone = fields.Char(related='employee_id.work_phone',string='联系电话') yuthon_company = fields.Selection(related='employee_id.yuthon_company', string="任职单位") - job_id = fields.Many2one(related='users_id.employee_id.job_id', string="主岗") - duties_id = fields.Many2one(related='users_id.employee_id.job_id', string="职务") - job_type_id = fields.Many2one('hr.job.type', string="岗位类别") - onboarding_date = fields.Date(related='users_id.employee_id.open_start_time', string="任职日期") - end_of_contract = fields.Date(related='users_id.employee_id.open_start_time',string="入职日期") - parent_id = fields.Many2one(related='users_id.employee_id.parent_id', string="直线上级") + job_id = fields.Many2one(related='employee_id.job_id', string="主岗") + duties_id = fields.Many2one(related='employee_id.job_id', string="职务") + onboarding_date = fields.Date(related='employee_id.open_start_time', string="任职日期") + end_of_contract = fields.Date(related='employee_id.open_start_time',string="入职日期") + parent_id = fields.Many2one(related='employee_id.parent_id', string="直线上级") business_superior_id = fields.Many2one("hr.employee", string="业务上级") place_of_work = fields.Char(string="工作地点") - use_user_type = fields.Selection(related="users_id.employee_id.use_user_type", string="聘用形式") + use_user_type = fields.Selection(related="employee_id.use_user_type", string="聘用形式") person_attributes = fields.Selection([('in', '编制内'), ('out', '编制外')], string="人员属性") is_issues = fields.Boolean(string='是否上会') issues_result = fields.Html(string="会议结果") @@ -40,7 +38,6 @@ class YuthonReassignmentApproval(models.Model): #异动信息 change_kind = fields.Char(string="异动类型") - change_rank = fields.Char(string='职级') change_reason = fields.Char(string="异动原因") change_date = fields.Date(string="调动日期") change_yuthon_company = fields.Selection([('thtz', '集团本部'), ('thwg', '天河物管'), @@ -51,7 +48,6 @@ class YuthonReassignmentApproval(models.Model): notice_documents_ids = fields.Many2many('ir.attachment', string="附件") change_parent_id = fields.Many2one("hr.employee", string="直线上级") change_business_superior_id = fields.Many2one("hr.employee", string="业务上级") - change_duties_id= fields.Many2one('job_id', string="职务") change_department_id = fields.Many2one("hr.department", string="任职部门") change_job_type_id = fields.Many2one('hr.job.type', string="岗位类别") change_job_id = fields.Many2one("hr.job", string="主岗") diff --git a/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py b/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py index 7b3376f16..3acc271c5 100644 --- a/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py @@ -8,19 +8,18 @@ class YuthonRegularizationPrepareApproval(models.Model): _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string="名称") - department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门") + department_id = fields.Many2one(related='employee_id.department_id', string="部门") users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) + employee_id = fields.Many2one('hr.employee', string="员工姓名") code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_regularization_approval_code')) - job_id = fields.Many2one(related='users_id.employee_id.job_id', string="主岗") - phone = fields.Char(string='手机号') - job = fields.Char(string="职务") + job_id = fields.Many2one(related='employee_id.job_id', string="主岗") + phone = fields.Char(related='employee_id.mobile_phone', string='手机号') yuthon_company = fields.Selection([('thtz', '集团本部'), ('thwg', '天河物管'), ('thlc', '天河粮储')], string="任职单位") - job_type_id = fields.Many2one('hr.job.type', string="岗位类别") - onboarding_time = fields.Date(related='users_id.employee_id.open_start_time',string="入职日期") - trial_end_date = fields.Date(string="试用期结束日期") - parent_id = fields.Many2one(related='users_id.employee_id.parent_id',string="直线上级") + onboarding_time = fields.Date(string="入职日期") + trial_end_date = fields.Date(related='employee_id.open_start_time', string="试用期结束日期") + parent_id = fields.Many2one(related='employee_id.parent_id',string="直线上级") business_leader = fields.Char(string="业务线上级") is_issues = fields.Boolean(string='是否上会') issues_result = fields.Html(string="会议结果") 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 d88ce5731..ed1c95837 100644 --- a/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml @@ -47,7 +47,7 @@ - + diff --git a/yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml index e05b6c33e..13a4e737d 100644 --- a/yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml @@ -53,17 +53,15 @@ - + - - @@ -71,7 +69,7 @@ - + @@ -91,8 +89,6 @@ - - diff --git a/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml index 523697a49..a2600de65 100644 --- a/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml @@ -52,26 +52,23 @@ - + + - + - - - - 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 d79a7259e..a5a1d5021 100644 --- a/yuthon_hr_employee_approval/views/yuthon_retired_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_retired_approval_views.xml @@ -53,7 +53,7 @@ - + diff --git a/yuthon_salary/views/yuthon_payroll_project_views.xml b/yuthon_salary/views/yuthon_payroll_project_views.xml index cef5ac4e6..d5aec7419 100644 --- a/yuthon_salary/views/yuthon_payroll_project_views.xml +++ b/yuthon_salary/views/yuthon_payroll_project_views.xml @@ -60,14 +60,14 @@ - - - - - - - - + + + + + + + +