caipin пре 5 година
родитељ
комит
2c80aa3f72
1 измењених фајлова са 14 додато и 2 уклоњено
  1. 14 2
      protected/class/receipt.func.php

+ 14 - 2
protected/class/receipt.func.php

@@ -1749,11 +1749,11 @@ function excelRCData($summaryData,$aiAllList,$year){
 			//$obj->getActiveSheet()->mergeCells($col.'1:'.$col.'2');
 			//$obj->getActiveSheet()->mergeCells($col.'1:'.$col.'2');
 		}
 		}
 		
 		
-		$colNum++;
+		
 		if($colNum==$cellCount){
 		if($colNum==$cellCount){
 			$maxCol=$col;
 			$maxCol=$col;
 		}
 		}
-		
+		$colNum++;
 	}
 	}
 	$obj->getActiveSheet()->getDefaultRowDimension()->setRowHeight(18);
 	$obj->getActiveSheet()->getDefaultRowDimension()->setRowHeight(18);
 	
 	
@@ -1769,6 +1769,18 @@ function excelRCData($summaryData,$aiAllList,$year){
 	$obj->getActiveSheet()->mergeCells('B1:G2');
 	$obj->getActiveSheet()->mergeCells('B1:G2');
 	$obj->getActiveSheet()->mergeCells('H1:'.$maxCol.'1');
 	$obj->getActiveSheet()->mergeCells('H1:'.$maxCol.'1');
 	
 	
+	
+	//表头内容
+	$obj->getactivesheet()->setCellValue ( 'A1','费用项' );
+	$obj->getactivesheet()->setCellValue ( 'B1','收入' );
+	$obj->getactivesheet()->setCellValue ( 'B3','利润' );
+	$obj->getactivesheet()->setCellValue ( 'C3','利润占比' );
+	$obj->getactivesheet()->setCellValue ( 'D3','收入合计' );
+	$obj->getactivesheet()->setCellValue ( 'E3','软件收入' );
+	$obj->getactivesheet()->setCellValue ( 'F3','培训及其他收入' );
+	$obj->getactivesheet()->setCellValue ( 'G3','费用合计' );
+	
+	
 // 	echo (int)($cellCount/26).'</br>';
 // 	echo (int)($cellCount/26).'</br>';
 // 	echo ($cellCount%26).'</br>';
 // 	echo ($cellCount%26).'</br>';