| 
															
																@@ -2678,22 +2678,22 @@ class ReceiptExtendController extends DooController { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     		$list=$receiptDetail->getReceiptDetailByYear($cidIn,$year); 
															 | 
															
															 | 
															
																     		$list=$receiptDetail->getReceiptDetailByYear($cidIn,$year); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     		 
															 | 
															
															 | 
															
																     		 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     		$cidArray=explode(',', $cidIn); 
															 | 
															
															 | 
															
																     		$cidArray=explode(',', $cidIn); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-    		$data=array(); 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+    		$dataSummary=array(); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     		foreach ($cidArray as $cak=>$cav){ 
															 | 
															
															 | 
															
																     		foreach ($cidArray as $cak=>$cav){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-    			$data[$cav]=array(); 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+    			$dataSummary[$cav]=array(); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     			for($month=1;$month<=12;$month++){ 
															 | 
															
															 | 
															
																     			for($month=1;$month<=12;$month++){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     				foreach ($aiList as $aik=>$aiv){ 
															 | 
															
															 | 
															
																     				foreach ($aiList as $aik=>$aiv){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-    					$data[$cav][$month][$aiv['category']]=array(); 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+    					$dataSummary[$cav][$month][$aiv['category']]=array(); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     				} 
															 | 
															
															 | 
															
																     				} 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-    				$data[$cav][$month]['报销金额调整']=array(); 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+    				$dataSummary[$cav][$month]['报销金额调整']=array(); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     			} 
															 | 
															
															 | 
															
																     			} 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     		} 
															 | 
															
															 | 
															
																     		} 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     		foreach ($list as $key=>$value){ 
															 | 
															
															 | 
															
																     		foreach ($list as $key=>$value){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-    			array_push($data[$value['cid']][$value['month']][$value['itemCategory']], $value); 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+    			array_push($dataSummary[$value['cid']][$value['month']][$value['itemCategory']], $value); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     		} 
															 | 
															
															 | 
															
																     		} 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     		 
															 | 
															
															 | 
															
																     		 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+    		//构建数据html 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     		$cglist=$category->getCategoryInCid($cidIn); 
															 | 
															
															 | 
															
																     		$cglist=$category->getCategoryInCid($cidIn); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-    		//展示html 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     		//print_r($aiAllList); 
															 | 
															
															 | 
															
																     		//print_r($aiAllList); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     		foreach ($cglist as $cgk=>$value){ 
															 | 
															
															 | 
															
																     		foreach ($cglist as $cgk=>$value){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     			for($month=1;$month<=12;$month++){ 
															 | 
															
															 | 
															
																     			for($month=1;$month<=12;$month++){ 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@@ -2703,7 +2703,13 @@ class ReceiptExtendController extends DooController { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     			} 
															 | 
															
															 | 
															
																     			} 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     		} 
															 | 
															
															 | 
															
																     		} 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     		 
															 | 
															
															 | 
															
																     		 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-    		print_r($data); 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+    		//构建栏目展示Html 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+    		$sectionHtml=''; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+    		foreach ($aiList as $key=>$value){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+    			$sectionHtml.='<th colspan="'.$value['itemCount'].'">'.$value['category'].'</th>'; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+    		} 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+    		 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+    		print_r($sectionHtml); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     	} 
															 | 
															
															 | 
															
																     	} 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     	 
															 | 
															
															 | 
															
																     	 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     	 
															 | 
															
															 | 
															
																     	 
															 |