From 9315aa7c8c3c16ff2424a5c9593568de5f51d37e Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 22 Jul 2025 16:22:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E5=9C=A8=E7=BC=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/attendance/otherovertimechart.vue | 27 +++++++++++----------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/views/attendance/otherovertimechart.vue b/src/views/attendance/otherovertimechart.vue
index e01756e..818c8da 100644
--- a/src/views/attendance/otherovertimechart.vue
+++ b/src/views/attendance/otherovertimechart.vue
@@ -56,12 +56,12 @@
-
+
@@ -136,9 +136,9 @@
name,
department,
overtime,
- // time_off,
- // use_overtime,
- // discount,
+ time_off,
+ deduct_hour_sum,
+ discount_hour_sum,
} = item;
let obj = {}
const allDay = overtime.reduce((sum, overtimeItem) => sum + parseFloat(overtimeItem.jiabanshichang), 0);
@@ -166,9 +166,9 @@
overtimeItem.department_id = department.id
overtimeItem.allDay = parseFloat(allDay).toFixed(2);
overtimeItem.allConvertTime = parseFloat(allConvertTime).toFixed(2);
- // overtimeItem.time_off = parseFloat(time_off).toFixed(2);
- // overtimeItem.use_overtime = parseFloat(use_overtime).toFixed(2);
- // overtimeItem.discount = parseFloat(discount).toFixed(2);
+ overtimeItem.time_off = parseFloat(time_off).toFixed(2);
+ overtimeItem.deduct_hour_sum = parseFloat(deduct_hour_sum).toFixed(2);
+ overtimeItem.discount_hour_sum = parseFloat(discount_hour_sum).toFixed(2);
result.push(overtimeItem);
// 累计折算时长
@@ -201,15 +201,16 @@
const columns = this.$refs.table.getColumns();
let mergeCells = [];
// ,'time_off','use_overtime','discount'
- const columnsToMerge = ['department_name', 'name', 'allDay', 'allConvertTime'];
+ const columnsToMerge = ['department_name', 'name', 'allDay', 'allConvertTime','time_off','deduct_hour_sum','discount_hour_sum'];
columnsToMerge.forEach(key => {
const col = columns.findIndex(item => item['field'] === key);
if (col === -1) {
return;
}
-
- if (key === 'allDay' || key === 'allConvertTime') {
+ if (key === 'allDay' || key === 'allConvertTime'||
+ key === 'time_off' || key === 'deduct_hour_sum'||
+ key === 'discount_hour_sum') {
// 对于 allDay 和 allConvertTime 列，先按 name 分组处理
const groupedByName = {};
data.forEach((row, index) => {