diff --git a/src/views/attendance/otherovertimechart.vue b/src/views/attendance/otherovertimechart.vue index b69c3ad..e01756e 100644 --- a/src/views/attendance/otherovertimechart.vue +++ b/src/views/attendance/otherovertimechart.vue @@ -56,12 +56,12 @@ - + title="扣减调休后的折算累计(h)"> --> @@ -136,9 +136,9 @@ name, department, overtime, - time_off, - use_overtime, - discount, + // time_off, + // use_overtime, + // discount, } = 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.use_overtime = parseFloat(use_overtime).toFixed(2); + // overtimeItem.discount = parseFloat(discount).toFixed(2); result.push(overtimeItem); // 累计折算时长 @@ -200,8 +200,8 @@ generateMergeCells(data) { const columns = this.$refs.table.getColumns(); let mergeCells = []; - - const columnsToMerge = ['department_name', 'name', 'allDay', 'allConvertTime','time_off','use_overtime','discount']; +// ,'time_off','use_overtime','discount' + const columnsToMerge = ['department_name', 'name', 'allDay', 'allConvertTime']; columnsToMerge.forEach(key => { const col = columns.findIndex(item => item['field'] === key);