diff --git a/excel_report_designer/controllers/excel_report_designer.py b/excel_report_designer/controllers/excel_report_designer.py index c068dda19..a902a9bcb 100644 --- a/excel_report_designer/controllers/excel_report_designer.py +++ b/excel_report_designer/controllers/excel_report_designer.py @@ -50,12 +50,18 @@ class XLSXReportController(http.Controller): report_obj.get_xlsx_salary_report(options, response) elif report_name == '请假情况报表': report_obj.get_xlsx_leave_report(options, response) + elif report_name == '归档请假情况报表': + report_obj.get_xlsx_leave_report(options, response) elif report_name == '加班明细报表': report_obj.get_xlsx_overtime_report(options, response) elif report_name == '加班详情报表': report_obj.get_xlsx_overtime_detail_report(options, response) elif report_name == '加班归档明细报表': report_obj.get_xlsx_overtime_active_report(options, response) + elif report_name == '误餐明细报表': + report_obj.get_xlsx_meal_report(options, response) + elif report_name == '误餐归档明细报表': + report_obj.get_xlsx_meal_active_report(options, response) else: report_obj.get_xlsx_report(options, response) response.set_cookie('fileToken', token) diff --git a/yuthon_hr_attendance/wizard/export_date_wizard.py b/yuthon_hr_attendance/wizard/export_date_wizard.py index 6274b5528..e1e9cdbe2 100644 --- a/yuthon_hr_attendance/wizard/export_date_wizard.py +++ b/yuthon_hr_attendance/wizard/export_date_wizard.py @@ -74,7 +74,6 @@ class ExportDateWizard(models.TransientModel): 'fields_name': fields_name, 'field_label': field_label, 'active_ids': filtered_ids, - 'date_field': False, } return { @@ -118,7 +117,6 @@ class ExportDateWizard(models.TransientModel): 'fields_name': fields_name, 'field_label': field_label, 'active_ids': filtered_ids, - 'date_field': False, } return { @@ -157,7 +155,6 @@ class ExportDateWizard(models.TransientModel): 'fields_name': fields_name, 'field_label': field_label, 'active_ids': filtered_ids, - 'date_field': False, } return { @@ -197,7 +194,6 @@ class ExportDateWizard(models.TransientModel): 'fields_name': fields_name, 'field_label': field_label, 'active_ids': filtered_ids, - 'date_field': False, } return { @@ -237,7 +233,6 @@ class ExportDateWizard(models.TransientModel): 'fields_name': fields_name, 'field_label': field_label, 'active_ids': filtered_ids, - 'date_field': False, } return { @@ -277,7 +272,6 @@ class ExportDateWizard(models.TransientModel): 'fields_name': fields_name, 'field_label': field_label, 'active_ids': filtered_ids, - 'date_field': False, } return { @@ -317,7 +311,6 @@ class ExportDateWizard(models.TransientModel): 'fields_name': fields_name, 'field_label': field_label, 'active_ids': filtered_ids, - 'date_field': False, } return {