caipin 5 gadi atpakaļ
vecāks
revīzija
45cb1abb72

+ 21 - 0
protected/class/date.func.php

@@ -0,0 +1,21 @@
+<?php
+
+function _getDateHtml($year){
+	$dateHtml = "";
+	$now = date ( "Y" );
+	for($YEARD = 2050; $YEARD >= 2004; $YEARD --) {
+		
+		if ($YEARD <= $now) {
+			$dateHtml .= '<option ';
+			if ($year == $YEARD) {
+				$dateHtml .= 'selected ';
+			}
+			$dateHtml .= 'value="' . $YEARD . '">' . $YEARD . '</option>';
+		}
+	}
+	return $dateHtml;
+}
+
+ 
+
+?>

+ 1 - 0
protected/config/acl.conf.php

@@ -494,6 +494,7 @@ $acl ['RECEIPTSEXTEND'] ['allow'] = array (
                 'receiptTrainRevenueAchieve',
 				'receiptSummaryStatisticsByAgency',
 				'setSummaryCategory',
+				'exportReceiptSummaryExcel',
 		)
 );
 $acl ['RECEIPTSAJAX'] ['allow'] = array (

+ 13 - 3
protected/controller/ReceiptExtendController.php

@@ -2712,7 +2712,6 @@ class ReceiptExtendController extends DooController {
     			}
     		}
     		
-    		
     	}
     	
     	//办事处显示设置
@@ -2729,8 +2728,16 @@ class ReceiptExtendController extends DooController {
     		}
     	}
     	
+    	//年份展示
+    	Doo::loadClass ( 'date.func' );
+    	$dateHtml=_getDateHtml($year);
+    	
+    	$summarData=json_encode($dataSummary);
+    	
+    	$data['summarData']=$summarData;
     	$data['categoryList']=$categoryList;
     	
+    	$data['dateHtml']=$dateHtml;
     	$data['sectionHtml']=$sectionHtml;
     	$data['sectionItemHtml']=$sectionItemHtml;
     	$data['summaryDateHtml']=$summaryDateHtml;
@@ -2744,7 +2751,7 @@ class ReceiptExtendController extends DooController {
     	
     	$this->render ( "/receipt/receiptSummaryStatisticsByAgency", $data );
     }
-    
+    //设置办事处展示明细
     function setSummaryCategory(){
     	$cidKey= $this->get_args ( 'cidKey' ) ? $this->get_args ( 'cidKey' ) : "";
     	
@@ -2753,7 +2760,10 @@ class ReceiptExtendController extends DooController {
     	
     	return '/receiptSummaryStatisticsByAgency';
     }
-    
+    //导出excel
+    function exportReceiptSummaryExcel(){
+    	
+    }
     
 	function exportReceiptTrainExcel() {
 		$rtidKey = $this->get_args ( 'rtidKey' ) ? $this->get_args ( 'rtidKey' ) : "";

+ 17 - 2
protected/view/receipt/receiptSummaryStatisticsByAgency.html

@@ -25,13 +25,28 @@
 			</div>
 			<div class="adminContent autoHeight" style="height: 821px;">
 				<legend>办事处 全年费用汇总</legend>
-				<div class="demandCate">
+			<div class="demandCate">
+			
+			
 					<ul class="cateList">
+					<form action="/receiptSummaryStatisticsByAgency"  method="post">
+					
 	  					<li><a href="saea-dlist-category-year.html">办事处</a><a href="saea-dlist-category-year2.html" class="now">办事处明细</a><a href="saea-dlist-staff-year.html">员工</a></li>
-	  					<li><select><option>2019</option></select></li>
+	  					<li>
+	  					<select name="year">
+	  					{{dateHtml}}
+	  					</select>
+	  					</li>
 	  					<li><a href="#view-setting" data-toggle="modal">显示设置</a></li>
+	  					</form>
+	  					
+	  					<form action="/exportReceiptSummaryExcel"  method="post">
+	  					<input type="hidden" name="summaryData" value="{{summarData}}">
 	  					<li><a href="#export" data-toggle="modal" class="button">导出</a></li>
+	  					</form>
 	  			</ul>
+	  		
+	  			
 	  		</div>
 	  		<div class="saeaList">
 	  			<div class="entry">