From ed2dd591222abad5f13e16cc6b6290906a748d4b Mon Sep 17 00:00:00 2001
From: ONION <2275333053@qq.com>
Date: Tue, 18 Jun 2024 16:15:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E8=A7=92=E8=89=B2=E5=AD=97=E6=AE=B5?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yuthon_hr_employee/models/yuthon_hr_employee.py | 3 ++-
yuthon_hr_employee/views/yuthon_hr_employee_views.xml | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/yuthon_hr_employee/models/yuthon_hr_employee.py b/yuthon_hr_employee/models/yuthon_hr_employee.py
index 1e7c5a40c..f592e25ed 100644
--- a/yuthon_hr_employee/models/yuthon_hr_employee.py
+++ b/yuthon_hr_employee/models/yuthon_hr_employee.py
@@ -26,7 +26,8 @@ class YuthonHrEmployee(models.Model):
('part_time', '兼职人员'), ('practice', '正式工')], string="用工形式")
user_number = fields.Char(string="员工编号")
job_lv_id = fields.Many2one('yuthon.job.lv', string="最新职级")
- user_role_ids = fields.Many2many('yuthon.user.role', string="角色")
+ user_role_id = fields.Many2one('yuthon.user.role', string="主角色")
+ user_role_ids = fields.Many2many('yuthon.user.role', string="辅助角色")
# 个人信息
user_salary = fields.Float(string="基本工资")
job_lv_salary = fields.Float(string="职级工资")
diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
index e4b662f5e..1151b9d1f 100644
--- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
@@ -98,6 +98,7 @@
+