1

protected/class/receipt.func.php

@@ -11,16 +11,13 @@ function _getReceiptSummaryHtml($cglist,$aiAllList,$dataSummary){
 		//初始化年合计数组
 		foreach ($aiAllList as $yptempk=>$yptempv){
 			$yearPriceArray[$yptempk]=0;
-			
 			//栏目细则
-// 			foreach ($value as $k=>$v){
-// 				$summaryYearHtml.='<th>'.$v['name'].'</th>';
-// 			}
+			foreach ($yptempv as $k=>$v){
+				$yearPriceArray[$yptempk][$v['name']]=0;
+			}
 		}
 		
 		
-		
-		
 		//办事处每月数据展示
 		$summaryDateHtml='';
 		for($month=1;$month<=12;$month++){
@@ -44,6 +41,7 @@ function _getReceiptSummaryHtml($cglist,$aiAllList,$dataSummary){
 							if($dsv['item']==$v['name']){
 								$tempHtml.='<td class="taR">'.$dsv['price'].'</td>';
 								$tempPrice+=$dsv['price'];
+								$yearPriceArray[$aiak][$v['name']]+=$dsv['price'];//该办事处项目细则金额合计
 								$falg=false;
 								break;
 							}
@@ -85,7 +83,7 @@ function _getReceiptSummaryHtml($cglist,$aiAllList,$dataSummary){
 			$summaryYearHtml.='<td class="taR colRed">'.$yearPriceArray[$aalk].'</td>';
 			//栏目细则
 			foreach ($aalv as $k=>$v){
-				$summaryYearHtml.='<th>'.$v['name'].'</th>';
+				$summaryYearHtml.='<th>'.$yearPriceArray[$aalk][].'</th>';
 			}
 		}
 		$summaryYearHtml.='</tr>';