From 265c615d9171e2aec89dd7d0627568e83dffde6f Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Fri, 27 Dec 2024 19:38:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yuthon_hr_attendance/models/hr_attendance.py | 1 +
.../views/hr_attendance_views.xml | 147 +-----------------
yuthon_work_brand/views/attendance_menu.xml | 75 ++-------
3 files changed, 17 insertions(+), 206 deletions(-)
diff --git a/yuthon_hr_attendance/models/hr_attendance.py b/yuthon_hr_attendance/models/hr_attendance.py
index 6d67cb940..7cd183ddf 100644
--- a/yuthon_hr_attendance/models/hr_attendance.py
+++ b/yuthon_hr_attendance/models/hr_attendance.py
@@ -21,6 +21,7 @@ class HrAttendance(models.Model):
is_abnormal = fields.Boolean(string="异常", group_operator='count_true')
work_time_type = fields.Selection([('close_day', '休息日'), ('work_day', '工作日')], string="工作时间类型")
company_id = fields.Many2one('res.company', string='公司', index=True, default=lambda self: self.env.company)
+ planning_slot_id = fields.Many2one('planning.slot', string='班次')
on_card_location = fields.Char(string="上班打卡地点")
down_card_location = fields.Char(string="下班打卡地点")
out_card_time = fields.Datetime(string="外出打卡时间")
diff --git a/yuthon_hr_attendance/views/hr_attendance_views.xml b/yuthon_hr_attendance/views/hr_attendance_views.xml
index a463d8527..5254a6926 100644
--- a/yuthon_hr_attendance/views/hr_attendance_views.xml
+++ b/yuthon_hr_attendance/views/hr_attendance_views.xml
@@ -10,6 +10,7 @@
+
@@ -47,107 +48,6 @@
-
-
- hr.attendance.going.tree3
- hr.attendance
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- hr.attendance.going.tree4
- hr.attendance
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- hr.attendance.going.tree5
- hr.attendance
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- hr.attendance.going.tree5
- hr.attendance
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
出勤
hr.attendance
@@ -181,59 +81,20 @@
hr.attendance
tree,form
{"search_default_employee": 1}
- [('employee_id.yuthon_company','=','thtz'), ('week', 'not in', ['seven', 'six'])]
+ [('employee_id.yuthon_company','=','thtz')]
天河粮储
hr.attendance
tree,form
{"search_default_employee": 1}
- [('employee_id.yuthon_company', '=', 'thlc'),
- ('week', 'not in', ['seven', 'six']),
- ('employee_id.department_id.name','not in',['仓储组', '综合组','保管组', '机安组', '1库', '2库', '3库', '联安粮库'])]
+ [('employee_id.yuthon_company', '=', 'thlc')]
天河物管
hr.attendance
tree,form
{"search_default_employee": 1}
- [('employee_id.yuthon_company', '=', 'thwg'), ('week', 'not in', ['seven', 'six']),
- ('employee_id.department_id.name','not in',['运行班', '高压班','综合班','班组A', '班组B','班组C'])]
-
-
- 考勤记录
- hr.attendance
- tree
- {"search_default_employee": 1}
- [('employee_id.department_id.name','in',['班组A', '班组B','班组C'])]
-
-
-
- 考勤记录
- hr.attendance
- tree
- {"search_default_employee": 1}
- [('employee_id.department_id.name','in',['运行班', '高压班','综合班'])]
-
-
-
- 考勤记录
- hr.attendance
- tree,form
- {"search_default_employee": 1}
- [('employee_id.department_id.name','in',['仓储组', '综合组','保管组', '机安组', '1库', '2库', '3库', '联安粮库'])]
-
-
-
- 考勤记录
- hr.attendance
- tree,form
- {"search_default_employee": 1}
- [('employee_id.department_id.name','=','客服中心')]]
-
+ [('employee_id.yuthon_company', '=', 'thwg')]
diff --git a/yuthon_work_brand/views/attendance_menu.xml b/yuthon_work_brand/views/attendance_menu.xml
index 141283fa8..5a664e245 100644
--- a/yuthon_work_brand/views/attendance_menu.xml
+++ b/yuthon_work_brand/views/attendance_menu.xml
@@ -95,7 +95,16 @@
parent="attendance_resources_setting_root_board"
sequence="4"
action="yuthon_hr_attendance.view_overtime_page_action"/>
-
+
+
@@ -108,16 +117,6 @@
name="保安部计划"
parent="yuthon_attendance_planning_board"
sequence="5"/>
-
-
-
-
-
+ sequence="1"/>
-
-
-
+ sequence="1"/>
-
-
-
-