1

protected/class/receipt.func.php

@@ -1720,10 +1720,23 @@ function cellColor($cells,$color,$obj){
 /**
  * 导出办事处全年汇中明细execl
  */
-function excelRCData($summaryData,$cellCount,$year){
+function excelRCData($summaryData,$aiAllList,$year){
 	Doo::loadClass ( 'PHPExcel1.7.9/PHPExcel' );
 	$obj = new PHPExcel ();
 	
+	//表头计算
+	$cellCount=$last=0;$sectionCount=array();
+	foreach ($aiAllList as $key=>$value){
+		//栏目细则个数
+		$sectionCount[$key]=count($value)+1;
+		$cellCount+=$sectionCount[$key];
+		
+		$sectionCount[$key]=$sectionCount[$key]+7;
+		$last=$sectionCount[$key];
+	}
+	$cellCount=$cellCount+7;
+	
+	
 	//设置宽高
 	$colNum=1;$maxCol='ZZ';
 	for ($col='A';$colNum<=$cellCount;$col++){
@@ -1754,7 +1767,7 @@ function excelRCData($summaryData,$cellCount,$year){
 	//设置合并单元格
 	$obj->getActiveSheet()->mergeCells('A1:A3');
 	$obj->getActiveSheet()->mergeCells('B1:G2');
-	//$obj->getActiveSheet()->mergeCells('B2:G2');
+	$obj->getActiveSheet()->mergeCells('H1:'.$maxCol.'1');
 	
 // 	echo (int)($cellCount/26).'</br>';
 // 	echo ($cellCount%26).'</br>';

protected/controller/ReceiptExtendController.php

@@ -2775,18 +2775,12 @@ class ReceiptExtendController extends DooController {
     		$accountItem = new accountItem ();
     		
     		$aiAllList=$accountItem->getAccountItem();
-    		$cellCount=0;
-    		foreach ($aiAllList as $key=>$value){
-    			//栏目细则个数
-    			$sectionCount=count($value)+1;
-    			$cellCount+=$sectionCount;
-    		}
-    		$cellCount=$cellCount+7;
+    		
     		
     		$summaryData=json_decode(urldecode($summaryData), true);
     		Doo::loadClass ( 'receipt.func' );
     		
-    		excelRCData($summaryData,$cellCount,$year);
+    		excelRCData($summaryData,$aiAllList,$year);
     	}
     	
     	die ( 'illegal request--excel Data null' );