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

!5542 添加功能

Browse Source 
Merge pull request !5542 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2025-10-10 10:39:14 +00:00
committed by Gitee
parent 1a452b3804 d103747305
commit 175eb1046f
4 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_employee_approval/models/yuthon_onboard_approval.py
+1
View File
@@ -179,6 +179,7 @@ class YuthonOnboardApproval(models.Model):
'department_id': self.department_id1.id
})
employee_id.send_wecom_employee()
employee_id.batch_action_create_user()
if self.contract_type == 'internship':
salary = self.salary
else:
yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py
+9 -10
View File
@@ -14,15 +14,14 @@ class YuthonReassignmentApproval(models.Model):
code = fields.Char(string="编号",
default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_reassignment_approval_code'))
phone = fields.Char(related='employee_id.work_phone',string='联系电话')
job_id = fields.Many2one(related='employee_id.job_id', string="主岗")
job_id = fields.Many2one(related='employee_id.job_id', string="岗位")
duties_id = fields.Many2one(related='employee_id.job_id', string="职务")
structure_id = fields.Many2one(related='employee_id.contract_id.structure_type_id', string='职级')
onboarding_date = fields.Date(related='employee_id.entry_date', string="任职日期")
end_of_contract = fields.Date(related='employee_id.entry_date',string="入职日期")
parent_id = fields.Many2one(related='employee_id.parent_id', 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="employee_id.use_user_type", string="聘用形式")
person_attributes = fields.Selection([('in', '编制内'), ('out', '编制外')], string="人员属性")
is_issues = fields.Boolean(string='是否上会')
issues_result = fields.Html(string="会议结果")
related_issues_id = fields.Many2one('issue.library', string="关联议题")
@@ -39,17 +38,17 @@ class YuthonReassignmentApproval(models.Model):
#异动信息
change_kind = fields.Char(string="异动类型")
change_reason = fields.Char(string="异动原因")
change_reason = fields.Text(string="异动原因")
change_date = fields.Date(string="调动日期")
handover_date = fields.Date(string="移交日期")
handover_person_id = fields.Many2one("hr.employee", string="工作接交人")
notification_change_id = fields.Many2one("hr.employee", string="异动告知人员")
handover_person_id = fields.Many2one("hr.employee", string="工作交接人")
appointment_date = fields.Date(string="入职日期")
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_parent_id = fields.Many2one("hr.employee", 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="主岗")
change_job_id = fields.Many2one("hr.job", string="岗位")
change_structure_id = fields.Many2one('hr.payroll.structure', string='职级')
change_place_of_work = fields.Char(string="工作地点")
handing_information_ids = fields.One2many('yuthon.over.infor.detail.lines','infor_id')
yuthon_hr_employee_approval/models/yuthon_renewal_approval.py
+1 -1
View File
@@ -22,7 +22,7 @@ class YuthonRenewalApproval(models.Model):
employee_id = fields.Many2one('hr.employee', string="续签员工")
card = fields.Char(related='employee_id.identification_id', string="身份证号")
department1_id = fields.Many2one(string="续签部门")
department1_id = fields.Many2one('hr.department', string="续签部门")
user_sex = fields.Selection(related='employee_id.user_sex', string="性别")
degree = fields.Char(related='employee_id.high_degree', string="学历")
onboard_time = fields.Date(related='employee_id.contract_id.date_end', string='入职时间')
yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml
+14 -20
View File
@@ -56,16 +56,15 @@
<field name="work_end" invisible="1"/>
<field name="users_id"/>
<field name="department_id" options="{'no_create': True}"/>
<field name="parent_id"/>
</group>
<group>
<field name="employee_id" options="{'no_create': True}"/>
<field name="business_superior_id"/>
<field name="place_of_work"/>
<field name="parent_id"/>
</group>
<group>
<field name="structure_id"/>
<field name="job_id"/>
<field name="person_attributes"/>
<field name="phone"/>
</group>
<group>
@@ -73,37 +72,32 @@
<field name="onboarding_date"/>
</group>
</group>
<group string="异动信息" col="4">
<group string="异动信息" col="3">
<group>
<field name="change_kind"/>
<field name="change_reason"/>
<field name="change_parent_id"/>
</group>
<group>
<field name="change_date"/>
<field name="change_department_id" widget="ztree_select"/>
<field name="change_business_superior_id"/>
</group>
<group>
<field name="change_job_id"/>
</group>
<group>
<field name="change_place_of_work"/>
<field name="change_structure_id"/>
<field name="change_date"/>
<field name="appointment_date"/>
</group>
<group>
<field name="change_department_id"/>
</group>
</group>
<group string="移交信息" col="4">
<group string="移交信息" col="3">
<group>
<field name="handover_date"/>
<field name="documents_ids" widget="preview_many2many"/>
</group>
<group>
<field name="change_reason"/>
</group>
<group>
<field name="handover_person_id"/>
</group>
<group>
<field name="notification_change_id"/>
</group>
<group>
<field name="documents_ids" widget="preview_many2many"/>
</group>
</group>
<notebook>
<page string="交接事项">