1

protected/class/receipt.func.php

@@ -100,11 +100,8 @@ function _getReceiptSummaryHtml($cglist,$aiAllList,$dataSummary,$year){
 		}
 		$summaryYearHtml.='</tr>';
 		
-		$html[$value['cid']]['total']=$summaryYearHtml;
-		$html[$value['cid']]['allMonth']=$summaryDateHtml;
-		
-		//$html.=$summaryYearHtml;//办事处合计
-		//$html.=$summaryDateHtml;//办事处每月合计
+		$html[$value['cid']]['total']=$summaryYearHtml; //办事处合计
+		$html[$value['cid']]['allMonth']=$summaryDateHtml; //办事处每月合计
 	}
 	
 	//全办事处全年合计
@@ -153,11 +150,8 @@ function _getReceiptSummaryHtml($cglist,$aiAllList,$dataSummary,$year){
 		$categoryHtml.=$html[$value['cid']]['total'];
 		$categoryHtml.=$categoryProportionHtml;
 		$categoryHtml.=$html[$value['cid']]['allMonth'];
-		//echo $html[$value['cid']]['allMonth'];die;
 	}
 	
-	
-	
 	$topHtml='';
 	$topHtml.=$topYearTempHtml;//全年合计
 	$topHtml.=$categoryHtml;//办事处合计

protected/controller/ReceiptExtendController.php

@@ -2700,10 +2700,6 @@ class ReceiptExtendController extends DooController {
     		$cglist=$category->getCategoryInCid($cidIn);
     		$summaryDateHtml=_getReceiptSummaryHtml($cglist,$aiAllList,$dataSummary,$year);
     		
-    		
-    		
-    		
-    		
     		//构建栏目展示Html
     		foreach ($aiAllList as $key=>$value){
     			//栏目

protected/view/receipt/receiptSummaryStatisticsByAgency.html

@@ -29,7 +29,8 @@
 					<ul class="cateList">
 	  					<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><a href="#view-setting" data-toggle="modal" class="button">导出</a></li>
+	  					<li><a href="#view-setting" data-toggle="modal">显示设置</a></li>
+	  					<li><a href="#export" data-toggle="modal" class="button">导出</a></li>
 	  			</ul>
 	  		</div>
 	  		<div class="saeaList">
@@ -74,7 +75,7 @@
 		</div>
 	</div>
 	<!--弹出 显示设置-->
-<div class="modal hide fade" id="view-setting">
+<div class="modal hide fade" id="export">
 	<div class="modal-dialog">
         <div class="modal-content">
 		    <div class="modal-header">
@@ -91,6 +92,23 @@
 </div>
     <!--结束弹出 显示设置-->
     
+    <div class="modal hide fade" id="view-setting">
+	<div class="modal-dialog">
+        <div class="modal-content">
+		    <div class="modal-header">
+		    <h3>显示设置</h3>
+		    </div>
+		    <div class="modal-body">
+		    	<label class="checkbox inline"><input type="checkbox">广东办</label>
+		    	<label class="checkbox inline"><input type="checkbox">广西办</label>
+		    </div>
+			<div class="modal-footer">
+			    <a href="#" class="button">确定</a>
+			    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+			</div>
+		</div>
+	</div>
+</div>