diff --git a/yuthon_hr_attendance/wizard/export_date_wizard.py b/yuthon_hr_attendance/wizard/export_date_wizard.py index c6b9a5438..dd1398b7d 100644 --- a/yuthon_hr_attendance/wizard/export_date_wizard.py +++ b/yuthon_hr_attendance/wizard/export_date_wizard.py @@ -55,7 +55,7 @@ class ExportDateWizard(models.TransientModel): """导出请假情况""" active_ids = json.loads(self.active_ids) if self.active_ids else [] - domain = [('date_from', '>=', start_date), ('date_from', '<', end_date)] + domain = [('date_from', '>=', start_date), ('date_from', '<', end_date), ('state', '!=', 'refuse')] if active_ids: domain = [('id', 'in', active_ids)] + domain diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml index 50de94665..93eab3984 100644 --- a/yuthon_issue/views/issue_library_views.xml +++ b/yuthon_issue/views/issue_library_views.xml @@ -251,9 +251,9 @@ string="党支部"/> - - - + + + diff --git a/yuthon_will_task/views/yuthon_will_task_views.xml b/yuthon_will_task/views/yuthon_will_task_views.xml index 2f80701d6..10cefb9d2 100644 --- a/yuthon_will_task/views/yuthon_will_task_views.xml +++ b/yuthon_will_task/views/yuthon_will_task_views.xml @@ -286,7 +286,6 @@ - @@ -317,13 +316,13 @@
- 参与人 等共人 + 参与人 共人
- 会议室 + 地点