caipin 5 年之前
父節點
當前提交
2c48eeaa4b
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      protected/class/receipt.func.php

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

@@ -1730,7 +1730,7 @@ function excelRCData($summaryData,$aiAllList,$year){
 		//栏目细则个数
 		//栏目细则个数
 		$cellCount+=count($value)+1;
 		$cellCount+=count($value)+1;
 		
 		
-		$sectionCount[$key]=array($last,count($value)+1+$last);
+		$sectionCount[$key]=array($last,count($value)+1+$last-1);
 		$last=count($value)+2+$last;
 		$last=count($value)+2+$last;
 	}
 	}
 	$cellCount=$cellCount+7+count($aiAllList);
 	$cellCount=$cellCount+7+count($aiAllList);
@@ -1797,6 +1797,7 @@ function excelRCData($summaryData,$aiAllList,$year){
 		$obj->getActiveSheet()->getStyle($value['0'].'2')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
 		$obj->getActiveSheet()->getStyle($value['0'].'2')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
 		$obj->getActiveSheet()->mergeCells($value['0'].'2:'.$value['1'].'2');
 		$obj->getActiveSheet()->mergeCells($value['0'].'2:'.$value['1'].'2');
 		$col=$value['0'];
 		$col=$value['0'];
+		$obj-> getActiveSheet() -> getStyle($col.'3') -> getFont()->getColor()->setRGB('f70000');
 		$obj->getactivesheet()->setCellValue ( $col.'3','合计');
 		$obj->getactivesheet()->setCellValue ( $col.'3','合计');
 		$col++;
 		$col++;
 		foreach ($aiAllList[$key] as $k=>$v){
 		foreach ($aiAllList[$key] as $k=>$v){