1

protected/class/receipt.func.php

@@ -4,9 +4,17 @@
  * 办事处汇总明细
  */
 function _getReceiptSummaryHtml($cglist,$aiAllList,$dataSummary){
-	$summaryDateHtml='';
+	$html='';
 	foreach ($cglist as $cgk=>$value){
+		
+		
+		
+		
+		
+		
+		
 		//办事处每月数据展示
+		$summaryDateHtml='';
 		for($month=1;$month<=12;$month++){
 			$summaryDateHtml.='<tr>';
 			$summaryDateHtml.='<th>'.$value['title'].$month.'月合计</th>
@@ -52,7 +60,33 @@ function _getReceiptSummaryHtml($cglist,$aiAllList,$dataSummary){
 			$summaryDateHtml.=$itemHtml;
 			$summaryDateHtml.='</tr>';
 		}
+		
+		
+		//办事处全年合计
+		$summaryYearHtml='<tr><th>'.$value['title'].'年合计</th>
+										<td class="taR"></td>
+										<td class="taR"></td>
+										<td class="taR"></td>
+										<td class="taR"></td>
+										<td class="taR"></td>
+										<td class="taR colGreen"></td>';
+		foreach ($aiAllList as $key=>$value){
+			//栏目
+			$summaryYearHtml.='<td class="taR colRed">'.$tempPrice.'</td>';
+			//栏目细则
+			foreach ($value as $k=>$v){
+				$summaryYearHtml.='<th>'.$v['name'].'</th>';
+			}
+		}
+		$summaryYearHtml.='</tr>';
+		
+		$html.=$summaryYearHtml;
+		$html.=$summaryDateHtml;
 	}
+	
+	
+	
+	
 	return $summaryDateHtml;
 }
 

protected/controller/ReceiptExtendController.php

@@ -2716,8 +2716,7 @@ class ReceiptExtendController extends DooController {
     			}
     		}
     		
-    		//print_r($aiAllList);
-    		//print_r($sectionHtml);
+    		
     	}