From af863d52c121d9e347a01687b627547e9614e449 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, 9 Feb 2026 10:33:20 +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/static/src/js/button_overtime_export.js | 2 +- yuthon_hr_attendance/wizard/export_date_wizard.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/yuthon_hr_attendance/static/src/js/button_overtime_export.js b/yuthon_hr_attendance/static/src/js/button_overtime_export.js index 0c40c036f..fb92e936d 100644 --- a/yuthon_hr_attendance/static/src/js/button_overtime_export.js +++ b/yuthon_hr_attendance/static/src/js/button_overtime_export.js @@ -35,7 +35,7 @@ export class CustomOvertimeExportController extends ListController { return this.actionService.doAction({ type: 'ir.actions.act_window', res_model: 'export.date.wizard', - name: '打印薪资', + name: '打印明细', view_mode: 'form', view_type: 'form', views: [[false, 'form']], diff --git a/yuthon_hr_attendance/wizard/export_date_wizard.py b/yuthon_hr_attendance/wizard/export_date_wizard.py index a35994aab..e0af039bb 100644 --- a/yuthon_hr_attendance/wizard/export_date_wizard.py +++ b/yuthon_hr_attendance/wizard/export_date_wizard.py @@ -134,7 +134,9 @@ class ExportDateWizard(models.TransientModel): """导出加班明细""" active_ids = json.loads(self.active_ids) if self.active_ids else [] - domain = [('carry_forward_date', '>=', start_date), ('carry_forward_date', '<', end_date)] + domain = [('start_time', '>=', start_date), ('start_time', '<', end_date), + '|', ('workflow_record_id', '!=', False), ('is_initial_number', '=', True), + ('update_type', '=', 'add'), ('is_filing', '=', False), ('is_visible', '=', False)] if active_ids: domain = [('id', 'in', active_ids)] + domain