From 6de3c22830752a0d2a34f7b10b503dc6d86872bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
<9664676+pengyuthon@user.noreply.gitee.com>
Date: Mon, 3 Nov 2025 22:31:24 +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
---
.../views/hr_attendance_views.xml | 30 +++++++++----------
.../views/yuthon_shift_approval_views.xml | 6 ++--
2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/yuthon_hr_attendance/views/hr_attendance_views.xml b/yuthon_hr_attendance/views/hr_attendance_views.xml
index b1abd971a..ebb6a8cdc 100644
--- a/yuthon_hr_attendance/views/hr_attendance_views.xml
+++ b/yuthon_hr_attendance/views/hr_attendance_views.xml
@@ -30,35 +30,35 @@
confirm="确定要删除选中的记录吗？" />
-
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
diff --git a/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml b/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
index 2c046b67a..919350e71 100644
--- a/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
@@ -75,7 +75,7 @@
('start_datetime', '>', shift_date + ' 00:00:00'),
('end_datetime', '<', shift_date + ' 23:59:59')
]"
- invisible="alternate_shifts == 'alternate'"
+ invisible="alternate_shifts != 'alternate' and not shift_date"
context="{'tree_view_ref': 'yuthon_hr_attendance.view_yuthon_shift_context',
'search_view_ref': 'yuthon_hr_attendance.search_yuthon_shift_context',
'order': 'start_datetime desc',
@@ -84,6 +84,7 @@
'search_view_ref': 'yuthon_hr_attendance.search_yuthon_shift_context',
'order': 'start_datetime desc',
'search_default_group_by_month': True,}" options="{'no_create': True, 'no_edit':True}"
+ invisible="not return_date"
domain="[
('resource_id', '=', resource_id),
('start_datetime', '>', return_date + ' 00:00:00'),
@@ -100,7 +101,7 @@
-