1

protected/class/receipt.func.php

@@ -1730,10 +1730,17 @@ function excelRCData($summaryData,$cellCount,$year){
 		$obj->getActiveSheet()->getColumnDimension($col)->setWidth(18);
 		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');
+		}
+		
 		$colNum++;
 		if($colNum==$cellCount){
 			$maxCol=$col;
 		}
+		
 	}
 	$obj->getActiveSheet()->getDefaultRowDimension()->setRowHeight(18);
 	
@@ -1746,7 +1753,6 @@ function excelRCData($summaryData,$cellCount,$year){
 	
 	//设置合并单元格
 	$obj->getActiveSheet()->mergeCells('A1:A3');
-	$obj->getActiveSheet()->mergeCells('B1:B2');
 	$obj->getActiveSheet()->mergeCells('B1:G1');
 	$obj->getActiveSheet()->mergeCells('B2:G2');