!4149 添加功能

Merge pull request !4149 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2025-07-29 08:46:11 +00:00
committed by Gitee
2 changed files with 11 additions and 0 deletions
@@ -58,6 +58,8 @@ class YuthonOnboardApproval(models.Model):
contracted_status = fields.Selection([('first', '首'
'签'), ('renew', '续签')], string='合同类型')
is_office = fields.Boolean(string='是否领用办公物品', default=False)
structure_type_id = fields.Many2one('hr.payroll.structure.type', string='工资结构类型', readonly=True)
is_annual_salary = fields.Boolean(string="是否年薪")
urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
default='normal')
active = fields.Boolean('Active', default=True, tracking=True)
@@ -124,6 +126,10 @@ class YuthonOnboardApproval(models.Model):
'name': self.employee_name,
'user_id': user.id, # 将用户与员工关联
})
use_user_type_name = dict(self._fields['use_user_type'].selection).get(self.use_user_type)
contract_type = self.env['hr.contract.type'].search([
('name', '=', use_user_type_name)
], limit=1)
form_id = self.env.ref('hr_contract.hr_contract_view_form').id
return {
'name': '合同',
@@ -135,6 +141,9 @@ class YuthonOnboardApproval(models.Model):
'default_job_id': self.job_id.id,
'default_employee_id': employee.id,
'default_date_start': self.duration_employment,
'default_structure_type_id': self.structure_type_id.id,
'default_is_annual_salary': self.is_annual_salary,
'default_contract_type_id': contract_type.id,
'default_date_end': self.duration_employment_end,
}}
@@ -74,6 +74,8 @@
<field name="use_user_type"/>
</group>
<group>
<field name="structure_type_id"/>
<field name="is_annual_salary"/>
<field name="job_id" readonly="0"/>
<field name="is_office"/>
</group>