1

protected/class/receipt.func.php

@@ -1735,9 +1735,7 @@ function excelRCData($summaryData,$aiAllList,$year){
 		$last=count($value)+1+$last;
 	}
 	$cellCount=$cellCount+7;
-	echo $cellCount;
-	print_r($sectionCount);
-	die;
+	
 	//设置宽高
 	$colNum=1;$maxCol='ZZ';
 	for ($col='A';$colNum<=$cellCount;$col++){
@@ -1745,17 +1743,28 @@ function excelRCData($summaryData,$aiAllList,$year){
 		cellColor($col.'1', 'ddebf7',$obj);cellColor($col.'2', 'ddebf7',$obj);
 		cellColor($col.'3', 'ddebf7',$obj);
 		
-		//合并收入单元格
-		if($colNum>1||$colNum>=7){
-			//$obj->getActiveSheet()->mergeCells($col.'1:'.$col.'2');
+		foreach ($sectionCount as $key=>$value){
+			$falg=false;
+			foreach ($value as $k=>$v){
+				if($v==$colNum){
+					$sectionCount[$key][$k]=$col;
+					$falg=true;
+					break;
+				}
+			}
+			if($falg){
+				break;
+			}
 		}
 		
-		
 		if($colNum==$cellCount){
 			$maxCol=$col;
 		}
 		$colNum++;
 	}
+	
+	print_r($sectionCount);DIE;
+	
 	$obj->getActiveSheet()->getDefaultRowDimension()->setRowHeight(18);
 	//设置字体居中
 	$obj->getActiveSheet()->getStyle('A1:'.$maxCol.'3')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);