caipin 5 年之前
父节点
当前提交
f2f09d7876

+ 4 - 0
protected/class/receipt.func.php

@@ -1,4 +1,8 @@
 <?php
+
+
+
+
 /**
  * 获得借款单详情
  */

+ 13 - 3
protected/controller/ReceiptExtendController.php

@@ -2665,7 +2665,7 @@ class ReceiptExtendController extends DooController {
     	$year=2019; //= $this->get_args ( 'year' ) ? $this->get_args ( 'year' ) : date('Y');
     	
     	
-    	$sectionHtml='';
+    	$sectionHtml=$sectionItemHtml='';
     	if(!empty($cidIn)){
     		Doo::loadModel ( 'receiptDetail' );
     		$receiptDetail = new receiptDetail ();
@@ -2693,6 +2693,9 @@ class ReceiptExtendController extends DooController {
     			array_push($dataSummary[$value['cid']][$value['month']][$value['itemCategory']], $value);
     		}
     		
+    		
+    		Doo::loadClass ( 'receipt.func' );
+    		
     		//构建数据html
     		$cglist=$category->getCategoryInCid($cidIn);
     		//print_r($aiAllList);
@@ -2706,8 +2709,14 @@ class ReceiptExtendController extends DooController {
     		
     		//构建栏目展示Html
     		
-    		foreach ($aiAllList as $key=>$value){ 
-    			$sectionHtml.='<th colspan="'.count($value).'">'.$key.'</th>';
+    		foreach ($aiAllList as $key=>$value){
+    			$sectionCount=count($value)+1;
+    			$sectionHtml.='<th colspan="'.$sectionCount.'">'.$key.'</th>';
+    			
+    			$sectionItemHtml.='<th class="colRed">合计</th>';
+    			foreach ($value as $k=>$v){
+    				$sectionItemHtml.='<th>'.$v['name'].'</th>';
+    			}
     		}
     		
     		//print_r($aiAllList);
@@ -2716,6 +2725,7 @@ class ReceiptExtendController extends DooController {
     	
     	
     	$data['sectionHtml']=$sectionHtml;
+    	$data['sectionItemHtml']=$sectionItemHtml;
     	
     	$data ['memu'] = "receipt";
     	$data ['staff'] = $this->staff;

文件差异内容过多而无法显示
+ 11 - 7
protected/view/receipt/receiptSummaryStatisticsByAgency.html