diff --git a/yuthon_hr_attendance/__manifest__.py b/yuthon_hr_attendance/__manifest__.py
index 9519a13f8..ac02263d2 100644
--- a/yuthon_hr_attendance/__manifest__.py
+++ b/yuthon_hr_attendance/__manifest__.py
@@ -25,6 +25,8 @@
'views/resource_calendar_leaves_views.xml',
'views/yuthon_adjustments_approval_views.xml',
'views/yuthon_duty_arrangement_views.xml',
+ 'views/inherit_planning_role_views.xml',
+ 'views/inherit_planning_slot_template_views.xml',
'views/yuthon_duty_summary_views.xml',
'views/yuthon_duty_setting_views.xml',
'views/yuthon_shift_approval_views.xml',
diff --git a/yuthon_hr_attendance/models/__init__.py b/yuthon_hr_attendance/models/__init__.py
index 401f7b0a9..4bb10c115 100644
--- a/yuthon_hr_attendance/models/__init__.py
+++ b/yuthon_hr_attendance/models/__init__.py
@@ -30,5 +30,6 @@ from . import yuthon_abnormal_approval
from . import yuthon_shift_approval
from . import yuthon_abnormal_setting
from . import yuthon_duty_plan
+from . import inherit_planning_slot_template
diff --git a/yuthon_hr_attendance/models/inherit_planning_role.py b/yuthon_hr_attendance/models/inherit_planning_role.py
index 010354756..5d670de84 100644
--- a/yuthon_hr_attendance/models/inherit_planning_role.py
+++ b/yuthon_hr_attendance/models/inherit_planning_role.py
@@ -6,3 +6,4 @@ class PlanningRole(models.Model):
_inherit = 'planning.role'
name = fields.Char(string='班次名称', required=True)
+ department_id = fields.Many2one('hr.department', string="部门")
diff --git a/yuthon_hr_attendance/models/inherit_planning_slot_template.py b/yuthon_hr_attendance/models/inherit_planning_slot_template.py
new file mode 100644
index 000000000..09afce977
--- /dev/null
+++ b/yuthon_hr_attendance/models/inherit_planning_slot_template.py
@@ -0,0 +1,8 @@
+from odoo import api, fields, models, tools
+from odoo.exceptions import ValidationError
+
+
+class PlanningSlotTemplate(models.Model):
+ _inherit = 'planning.slot.template'
+
+ department_id = fields.Many2one('hr.department', string="部门")
\ No newline at end of file
diff --git a/yuthon_hr_attendance/views/hr_attendance_views.xml b/yuthon_hr_attendance/views/hr_attendance_views.xml
index 82dc4130b..dc16214f9 100644
--- a/yuthon_hr_attendance/views/hr_attendance_views.xml
+++ b/yuthon_hr_attendance/views/hr_attendance_views.xml
@@ -44,15 +44,27 @@
[('employee_id.user_id', '=', uid)]
- 保安部考勤
+ 全部考勤
hr.attendance
tree,form
[('employee_id.department_id.name', '=', '保安部')]
- 工程部考勤
+ 全部考勤
hr.attendance
- tree,form
- [('employee_id.department_id.name', '=', '工程部')]
+ tree
+ [('employee_id.department_id.name', '=', '运行班')]
+
+
+ 全部考勤
+ hr.attendance
+ tree
+ [('employee_id.department_id.name' , '=' , '高压班')]
+
+
+ 全部考勤
+ hr.attendance
+ tree
+ [('employee_id.department_id.name', '=', '综合班')]
diff --git a/yuthon_hr_attendance/views/inherit_planning_role_views.xml b/yuthon_hr_attendance/views/inherit_planning_role_views.xml
new file mode 100644
index 000000000..0d7770ef8
--- /dev/null
+++ b/yuthon_hr_attendance/views/inherit_planning_role_views.xml
@@ -0,0 +1,39 @@
+
+
+ planning.role.tree.inherit
+ planning.role
+
+
+
+
+
+
+ 员工
+
+
+
+
+ 班次名称
+ planning.role
+ tree
+ [('department_id.name','=','保安部')]
+
+
+ 班次名称
+ planning.role
+ tree
+ [('department_id.name', '=', '运行班')]
+
+
+ 班次名称
+ planning.role
+ tree
+ [('department_id.name', '=', '高压班')]
+
+
+ 班次名称
+ planning.role
+ tree
+ [('department_id.name', '=', '综合班')]
+
+
\ No newline at end of file
diff --git a/yuthon_hr_attendance/views/inherit_planning_slot_template_views.xml b/yuthon_hr_attendance/views/inherit_planning_slot_template_views.xml
new file mode 100644
index 000000000..c679f06ba
--- /dev/null
+++ b/yuthon_hr_attendance/views/inherit_planning_slot_template_views.xml
@@ -0,0 +1,36 @@
+
+
+ planning.slot.template.tree.inherit
+ planning.slot.template
+
+
+
+
+
+
+
+
+ 班次模板
+ planning.slot.template
+ tree
+ [('department_id.name', '=', '保安部')]
+
+
+ 班次模板
+ planning.slot.template
+ tree
+ [('department_id.name', '=', '运行班')]
+
+
+ 班次模板
+ planning.slot.template
+ tree
+ [('department_id.name', '=', '高压班')]
+
+
+ 班次模板
+ planning.slot.template
+ tree
+ [('department_id.name', '=', '综合班')]
+
+
\ No newline at end of file
diff --git a/yuthon_performance/models/yuthon_index_employee.py b/yuthon_performance/models/yuthon_index_employee.py
index 05deb6959..7559cc8a8 100644
--- a/yuthon_performance/models/yuthon_index_employee.py
+++ b/yuthon_performance/models/yuthon_index_employee.py
@@ -5,13 +5,12 @@ class YuthonIndexEmployee(models.Model):
_name = 'yuthon.index.employee'
_description = '员工绩效标准库'
- name = fields.Char('标题', required=True)
start_index_time = fields.Date(string='生效时间', required=True)
end_index_time = fields.Date(string='失效时间')
users_role_ids = fields.Many2many('soong.user.role', string='角色')
department_ids = fields.Many2many('hr.department', string='部门')
employee_ids = fields.Many2many('hr.employee', string='人员')
- dimension = fields.Char('评价维度', required=True)
+ name = fields.Char('评价维度', required=True)
change_employee_library_id = fields.Many2one('yuthon.employee.approval', string='变更指标库')
index_employee_ids = fields.One2many('yuthon.index.employee.line', 'index_employee_id', string='指标库明细')
def put_employees_approval(self):
diff --git a/yuthon_performance/views/yuthon_index_employee.xml b/yuthon_performance/views/yuthon_index_employee.xml
index 678be93ae..8aebf5879 100644
--- a/yuthon_performance/views/yuthon_index_employee.xml
+++ b/yuthon_performance/views/yuthon_index_employee.xml
@@ -9,7 +9,7 @@
-
+
@@ -24,14 +24,9 @@