diff --git a/yuthon_hr_attendance/models/planning_template_inherit.py b/yuthon_hr_attendance/models/planning_template_inherit.py
index 1d7ef4f80..751d7a9b3 100644
--- a/yuthon_hr_attendance/models/planning_template_inherit.py
+++ b/yuthon_hr_attendance/models/planning_template_inherit.py
@@ -104,10 +104,10 @@ class PlanningSlotTemplate(models.Model):
@api.depends('role_id','planning_name')
def _compute_display_name(self):
for shift_template in self:
- name = '{} {} {}'.format(
- shift_template.planning_name,
- shift_template.name,
+ name = '{} {}'.format(
shift_template.role_id.name if shift_template.role_id.name is not False else '',
+ shift_template.planning_name
+
)
shift_template.display_name = name
@@ -129,7 +129,8 @@ class Planning(models.Model):
start_time_str = new_start_datetime.strftime("%Y-%m-%d")
# new_end_datetime = slot.end_datetime + timedelta(hours=8)
# end_time_str = new_end_datetime.strftime("%H:%M:%S")
- slot.display_name = f"{planning_name + '/' + start_time_str}"
+ # slot.display_name = f"{planning_name + '/' + start_time_str}"
+ slot.display_name = f"{planning_name}"
@api.depends('template_id.color')
def _compute_color(self):
diff --git a/yuthon_hr_attendance/views/inherit_planning_slot_views.xml b/yuthon_hr_attendance/views/inherit_planning_slot_views.xml
index 53f8aa4bb..2956ea05f 100644
--- a/yuthon_hr_attendance/views/inherit_planning_slot_views.xml
+++ b/yuthon_hr_attendance/views/inherit_planning_slot_views.xml
@@ -10,12 +10,43 @@
+
+
+
+ planning.slot.form.gantt.inherit
+ planning.slot
+ 10
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ planning.slot.gantt
+ planning.slot
+
+
+
+ %(planning_view_form_in_gantt_inherit)d
+ month
+
+
+
+
planning.slot.form.inherit
planning.slot
-
+
0
@@ -37,8 +68,8 @@
planning.slot
gantt,calendar,tree,form,kanban,pivot,graph
- {'planning_expand_resource': 1, 'planning_expand_role': 1, 'search_default_group_by_resource': 1,
- 'search_default_group_by_department': 1}
+ {'planning_expand_resource': 1, 'planning_expand_role': 1, 'search_default_group_by_resource': 1,
+ 'search_default_group_by_department': 1}
[('department_id.name', 'in', ['保安部', '班组A', '班组B', '班组C'])]
@@ -68,10 +99,10 @@
planning.slot
tree
gantt,calendar,tree,form,kanban,pivot,graph
- [('department_id.name', 'in', ['工程部','高压班','运行班','综合班'])]
-
- {'planning_expand_resource': 1, 'planning_expand_role': 1, 'search_default_group_by_resource': 1,
- 'search_default_group_by_department': 1}
+ [('department_id.name', 'in', ['工程部', '高压班', '运行班', '综合班'])]
+
+ {'planning_expand_resource': 1, 'planning_expand_role': 1, 'search_default_group_by_resource': 1,
+ 'search_default_group_by_department': 1}
@@ -96,20 +127,21 @@
tree
gantt,calendar,tree,form,kanban,pivot,graph
{'planning_expand_resource': 1, 'planning_expand_role': 1}
- [('department_id.name','=','综合班')]]
+ [('department_id.name', '=', '综合班')]]
联安粮库
planning.slot
gantt,calendar,tree,form,kanban,pivot,graph
{'planning_expand_resource': 1, 'planning_expand_role': 1}
- [('department_id.name','in',['仓储组', '综合组','保管组', '机安组', '1库', '2库', '3库', '联安粮库'])]]
+ [('department_id.name', 'in',
+ ['仓储组', '综合组', '保管组', '机安组', '1库', '2库', '3库', '联安粮库'])]]
客服中心
planning.slot
gantt,calendar,tree,form,kanban,pivot,graph
{'planning_expand_resource': 1, 'planning_expand_role': 1}
- [('department_id.name','=', '客户部')]
+ [('department_id.name', '=', '客户部')]
\ No newline at end of file