pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!1977 !1976 添加功能

Browse Source 
Merge pull request !1977 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-03-20 10:09:11 +00:00
committed by Gitee
parent e39cf13fe5 767adea07b
commit 8169bdf4d7
8 changed files with 33 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_employee_approval/models/inherit_hr_employee.py
+3 -3
View File
@@ -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,
}
}
yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py
+8 -12
View File
@@ -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="主岗")
yuthon_hr_employee_approval/models/yuthon_regularization_approval.py
+7 -8
View File
@@ -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="会议结果")
yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml
+1 -1
View File
@@ -47,7 +47,7 @@
<field name="documents_ids" widget="preview_many2many"/>
</group>
</group>
<group string="退休信息" col="3">
<group string="离职信息" col="3">
<group>
<field name="employee_id"/>
<field name="department_id"/>
yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml
+2 -6
View File
@@ -53,17 +53,15 @@
<group string="原员工信息" col="4">
<group>
<field name="work_end" invisible="1"/>
<field name="users_id" invisible="1"/>
<field name="users_id"/>
<field name="employee_id"/>
<field name="yuthon_company"/>
<field name="parent_id"/>
<field name="end_of_contract"/>
</group>
<group>
<field name="department_id"/>
<field name="business_superior_id"/>
<field name="place_of_work"/>
<field name="rank"/>
</group>
<group>
<field name="job_id"/>
@@ -71,7 +69,7 @@
<field name="phone"/>
</group>
<group>
<field name="duties_id"/>
<field name="end_of_contract"/>
<field name="onboarding_date"/>
</group>
</group>
@@ -91,8 +89,6 @@
<field name="change_job_id"/>
</group>
<group>
<field name="change_rank"/>
<field name="change_duties_id"/>
<field name="change_place_of_work"/>
</group>
</group>
yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml
+3 -6
View File
@@ -52,26 +52,23 @@
<group>
<field name="issues_result" invisible="is_issues == False"/>
</group>
<group string="员工信息" col="4">
<group string="员工信息" col="3">
<group>
<field name="users_id" required="1"/>
<field name="department_id"/>
<field name="onboarding_time"/>
<field name="work_end" invisible="1"/>
<field name="business_leader"/>
</group>
<group>
<field name="department_id"/>
<field name="employee_id"/>
<field name="trial_end_date"/>
<field name="phone"/>
</group>
<group>
<field name="job_id"/>
<field name="job_type_id"/>
<field name="parent_id"/>
</group>
<group>
<field name="job"/>
</group>
</group>
<group string="转正考核" col="4">
<group>
yuthon_hr_employee_approval/views/yuthon_retired_approval_views.xml
+1 -1
View File
@@ -53,7 +53,7 @@
<field name="documents_ids" widget="preview_many2many"/>
</group>
</group>
<group string="退休信息" col="3">
<group string="人员信息" col="3">
<group>
<field name="employee_id"/>
<field name="department_id"/>
yuthon_salary/views/yuthon_payroll_project_views.xml
+8 -8
View File
@@ -60,14 +60,14 @@
<field name="basic_endowment_insurance"/>
<field name="unemployment_insurance"/>
<field name="housing_provident_fund"/>
<field name="proportion_company"/>
<field name="proportion_employee"/>
<field name="proportion_company_ceiling"/>
<field name="proportion_company_floor"/>
<field name="company_base_ceiling"/>
<field name="company_base_floor"/>
<field name="employee_base_ceiling"/>
<field name="employee_base_floor"/>
<!-- <field name="proportion_company"/>-->
<!-- <field name="proportion_employee"/>-->
<!-- <field name="proportion_company_ceiling"/>-->
<!-- <field name="proportion_company_floor"/>-->
<!-- <field name="company_base_ceiling"/>-->
<!-- <field name="company_base_floor"/>-->
<!-- <field name="employee_base_ceiling"/>-->
<!-- <field name="employee_base_floor"/>-->
<field name="documents_ids" widget="preview_many2many"/>
<field name="remarks"/>
<field name="start_date"/>