非在编

src/views/attendance/otherovertimechart.vue

@@ -56,12 +56,12 @@
         <vxe-column width="120" header-align="center" align="center" field="allConvertTime"
           title="本月折算累计(h)"></vxe-column>
 
-        <!-- <vxe-column width="120" header-align="center" align="center" field="time_off"
+        <vxe-column width="120" header-align="center" align="center" field="time_off"
           title="调休汇总(h)"></vxe-column>
-        <vxe-column width="120" header-align="center" align="center" field="use_overtime"
+        <vxe-column width="120" header-align="center" align="center" field="deduct_hour_sum"
           title="扣减调休后汇总(h)"></vxe-column>
-        <vxe-column width="120" header-align="center" align="center" field="discount"
+        <vxe-column width="120" header-align="center" align="center" field="discount_hour_sum"
-          title="扣减调休后的折算累计(h)"></vxe-column> -->
+          title="扣减折算(h)"></vxe-column>
 
       </vxe-table>
     </card-container>
@@ -136,9 +136,9 @@
             name,
             department,
             overtime,
-            // time_off,
+            time_off,
-            // use_overtime,
+            deduct_hour_sum,
-            // discount,
+            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.time_off = parseFloat(time_off).toFixed(2);
-            // overtimeItem.use_overtime = parseFloat(use_overtime).toFixed(2);
+            overtimeItem.deduct_hour_sum = parseFloat(deduct_hour_sum).toFixed(2);
-            // overtimeItem.discount = parseFloat(discount).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) => {