|
|
@@ -2664,8 +2664,9 @@ class ReceiptExtendController extends DooController {
|
|
|
$cidIn = $this->get_args ( 'cidIn' ) ? $this->get_args ( 'cidIn' ) : '12,10,9';
|
|
|
$year=2019; //= $this->get_args ( 'year' ) ? $this->get_args ( 'year' ) : date('Y');
|
|
|
|
|
|
+
|
|
|
+ $sectionHtml='';
|
|
|
if(!empty($cidIn)){
|
|
|
-
|
|
|
Doo::loadModel ( 'receiptDetail' );
|
|
|
$receiptDetail = new receiptDetail ();
|
|
|
Doo::loadModel ( 'accountItem' );
|
|
|
@@ -2704,17 +2705,17 @@ class ReceiptExtendController extends DooController {
|
|
|
}
|
|
|
|
|
|
//构建栏目展示Html
|
|
|
- $sectionHtml='';
|
|
|
+
|
|
|
foreach ($aiAllList as $key=>$value){
|
|
|
- $sectionHtml.='<th colspan="'.count($value[$key]).'">'.$key.'</th>';
|
|
|
+ $sectionHtml.='<th colspan="'.count($value).'">'.$key.'</th>';
|
|
|
}
|
|
|
|
|
|
- print_r($aiAllList);
|
|
|
- print_r($sectionHtml);
|
|
|
+ //print_r($aiAllList);
|
|
|
+ //print_r($sectionHtml);
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
+ $data['sectionHtml']=$sectionHtml;
|
|
|
|
|
|
$data ['memu'] = "receipt";
|
|
|
$data ['staff'] = $this->staff;
|