caipin 5 年之前
父节点
当前提交
c6570c00e7

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

@@ -1723,6 +1723,8 @@ function cellColor($cells,$color,$obj){
 function excelRCData($summaryData,$cellCount,$year){
 	Doo::loadClass ( 'PHPExcel1.7.9/PHPExcel' );
 	$obj = new PHPExcel ();
+	echo $cellCount;die;
+	cellColor('A1:', 'ddebf7',$obj);
 	
 	$obj->getActiveSheet()->getStyle('A1:J1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
 	

+ 1 - 1
protected/controller/ReceiptExtendController.php

@@ -2781,7 +2781,7 @@ class ReceiptExtendController extends DooController {
     			$sectionCount=count($value)+1;
     			$cellCount+=$sectionCount;
     		}
-    		
+    		$cellCount=$cellCount+7;
     		
     		$summaryData=json_decode(urldecode($summaryData), true);
     		Doo::loadClass ( 'receipt.func' );

+ 1 - 1
protected/view/receipt/receiptSummaryStatisticsByAgency.html

@@ -166,7 +166,7 @@ $(document).ready( function () {
     		 "sInfo": "显示第 _START_ 至 _END_ 项结果,共 _TOTAL_ 项",
     	},
     	
-    	scrollY:        "800px",
+    	scrollY:        "400px",
         scrollX:        true,
         scrollCollapse: true,