员工日工资合计优化

src/view/performance/yuangongrigongzi.vue

@@ -456,7 +456,7 @@ const getTableData = async () => {
 	
   const response = await dailygetList({
 	  date: params.date, department: params.sys_id,});
-  console.log(response)
+  // console.log(response)
   if (response.code === 0) {
 	   const originalData = response.data;
 	      const summaryData = generateSummaryData(originalData);
@@ -473,7 +473,7 @@ const getTableData = async () => {
 			 
 	        }
 	      });
-		  console.log(combinedData)
+		  // console.log(combinedData)
 	      // 更新表格数据
 	      tableData.splice(0, tableData.length, ...combinedData);
   }
@@ -494,20 +494,23 @@ const generateSummaryData = (data) => {
       }
       // 创建新的合计数据
       currentSummary = {
-        '员工姓名': name,
-        '日期': 0,
+        '员工姓名': name,
+		'日期': 0,
         '计件工资': 0,
         '加班工资': 0,
+        '计时时数': 0,
+        '计时工资': 0,
         '日工资合计': 0
       };
       currentName = name;
     }
 
-    // 更新合计数据
-	
-    currentSummary['日期']++;
+    // 更新合计数据
+	currentSummary['日期']++;
     currentSummary['计件工资'] += parseFloat(item['计件工资']);
     currentSummary['加班工资'] += parseFloat(item['加班工资']);
+    currentSummary['计时时数'] += parseFloat(item['计时时数']);
+    currentSummary['计时工资'] += parseFloat(item['计时工资']);
     currentSummary['日工资合计'] += parseFloat(item['日工资合计']);
 	currentSummary['员工姓名']='合计（'+currentSummary['日期']+'天）';
   });
@@ -521,6 +524,8 @@ const generateSummaryData = (data) => {
   summaryData.forEach((summary) => {
     summary['计件工资'] = summary['计件工资'].toFixed(2); // 保留两位小数
 	summary['加班工资'] = summary['加班工资'].toFixed(2);
+	summary['计时时数'] = summary['计时时数'].toFixed(2);
+	summary['计时工资'] = summary['计时工资'].toFixed(2);
 	summary['日工资合计'] = summary['日工资合计'].toFixed(2);
   });