1

protected/controller/ReceiptExtendController.php

@@ -2693,7 +2693,7 @@ class ReceiptExtendController extends DooController {
     			array_push($dataSummary[$value['cid']][$value['month']][$value['itemCategory']], $value);
     		}
     		
-    		print_r($dataSummary);die;
+    		//print_r($dataSummary);die;
     		
     		Doo::loadClass ( 'receipt.func' );
     		
@@ -2703,8 +2703,9 @@ class ReceiptExtendController extends DooController {
     		foreach ($cglist as $cgk=>$value){
     			
     			//办事处每月数据展示
-    			$summaryDateHtml.='<tr>';
+    			
     			for($month=1;$month<=12;$month++){
+    				$summaryDateHtml.='<tr>';
     				$summaryDateHtml.='<th>'.$value['title'].$month.'月合计</th>
 										<td class="taR"></td>
 										<td class="taR"></td>
@@ -2714,16 +2715,19 @@ class ReceiptExtendController extends DooController {
 										<td class="taR colGreen"></td>';
     				
     				$itemHtml='';
-    				if(isset($dataSummary[$value['cid']])&&isset($dataSummary[$value['cid'][$month]])){
+    				if(isset($dataSummary[$value['cid']])){
     					foreach ($aiAllList as $aiak=>$aiav){
-    						
-    						
-    						$dataSummary[$value['cid']][$month];
-    						
-    						foreach ($dataSummary as $dsk=>$dsv){
-    							
+    						$falg=true;    						
+    						foreach ($dataSummary[$value['cid']][$month][$aiak] as $dsk=>$dsv){
+    							if($dsv['item']==$aiav['name']){
+    								$itemHtml.='<td class="taR">'.$dsv['price'].'</td>';
+    								$falg=false;  
+    								break;
+    							}
+    						}
+    						if($falg){
+    							$itemHtml.='<td class="taR"></td>';
     						}
-    						
     					}
     				}else{
     					foreach ($aiAllList as $aiak=>$aiav){
@@ -2731,12 +2735,11 @@ class ReceiptExtendController extends DooController {
     					}
     				}
     				
-    				
-    				
     				$summaryDateHtml.='<td class="taR colRed"></td>';
-    				
+    				$summaryDateHtml.=$itemHtml;
+    				$summaryDateHtml.='</tr>';
     			}
-    			$summaryDateHtml.='</tr>';
+    			
     		}
     		
     		//构建栏目展示Html
@@ -2758,6 +2761,7 @@ class ReceiptExtendController extends DooController {
     	
     	$data['sectionHtml']=$sectionHtml;
     	$data['sectionItemHtml']=$sectionItemHtml;
+    	$data['summaryDateHtml']=$summaryDateHtml;
     	
     	$data ['memu'] = "receipt";
     	$data ['staff'] = $this->staff;