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="确定要删除选中的记录吗？" />
                 </header>
                 <field name="employee_id" class="list_current_data" options="{'no_create': True}" />
-                <field name="is_expatriation" column_invisible="1""1"/>
+                <field name="is_expatriation" column_invisible="1"/>
                 <field name="current_data" optional="show" class="list_current_data" />
                 <field name="week" optional="show" class="list_ids_width" />
                 <field name="check_in" optional="show" widget="time"
                     decoration-danger="is_check_in_red == 1" />
                 <field name="check_out" optional="show" widget="time" class="list_current_data"
                     decoration-danger="is_check_out_red == 1" />
-                <field name="shift_id" column_invisible="1"1 column_invisible="1""1" />
+                <field name="shift_id" column_invisible="1"/>
                 <field name="shift_name" optional="show" class="list_current_data" />
-                <field name="is_week" column_invisible="1""1" />
-                <field name="is_holiday" column_invisible="1""1" />
+                <field name="is_week" column_invisible="1" />
+                <field name="is_holiday" column_invisible="1" />
                 <field name="create_date" />
-                <field name="user_id" column_invisible="1""1" />
-                <field name="is_clock_card" column_invisible="1""1" />
-                <field name="department_id" column_invisible="1""1" />
+                <field name="user_id" column_invisible="1" />
+                <field name="is_clock_card" column_invisible="1" />
+                <field name="department_id" column_invisible="1" />
                 <field name="is_no_card" optional="show" class="list_ids_width" />
                 <field name="is_early_card" optional="show" class="list_ids_width" />
                 <field name="is_late_card" optional="show" class="list_ids_width" />
                 <field name="absenteeism_card" optional="show" class="list_ids_width" string="旷工" />
                 <field name="is_abnormal" optional="show" class="list_ids_width" string="异常" />
-                <field name="abnormal" column_invisible="1""1" />
-                <field name="work_time_type"  column_invisible="1""1" />
-                <field name="is_approval"  column_invisible="1""1" />
-                <field name="is_check_in_red" column_invisible="1""1" />
-                <field name="is_check_out_red" column_invisible="1""1" />
-                <field name="is_holiday"  column_invisible="1""1" />
+                <field name="abnormal" column_invisible="1" />
+                <field name="work_time_type"  column_invisible="1" />
+                <field name="is_approval"  column_invisible="1" />
+                <field name="is_check_in_red" column_invisible="1" />
+                <field name="is_check_out_red" column_invisible="1" />
+                <field name="is_holiday"  column_invisible="1" />
                 <field name="correct_result"  />
-                <field name="is_warning"  column_invisible="1""1" />
-                <field name="is_workflow"  column_invisible="1""1" />
+                <field name="is_warning"  column_invisible="1" />
+                <field name="is_workflow"  column_invisible="1" />
                 <field name="workflow_id" />
                 <button name="button_controls_wizard" type="object" string="操作" class="oe_highlight"
                     invisible="not (is_abnormal or is_early_card or is_late_card or absenteeism_card or is_no_card)" />
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', '&gt;', shift_date + ' 00:00:00'),
                                    ('end_datetime', '&lt;', 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', '&gt;', return_date + ' 00:00:00'),
@@ -100,7 +101,7 @@
                             <field name="return_two_date"/>
                         </group>
                         <group>
-                          <field name="shift_two_id"
+                          <field name="shift_two_id" invisible="not shift_two_date"
                                  domain="[
                                    ('resource_id', '=', resource_id),
                                    ('start_datetime', '&gt;', shift_two_date + ' 00:00:00'),
@@ -114,6 +115,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_two_date"
                                 domain="[
                                    ('resource_id', '=', resource_id),
                                    ('start_datetime', '&gt;', return_two_date + ' 00:00:00'),