From 114cf4a503de40150214c0bcd470677ad78891cc Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Wed, 22 Apr 2020 17:59:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=9A=E5=90=88=E5=AF=B9=E8=B4=A6=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AF=B9=E8=B4=A6=E9=87=91=E9=A2=9D=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/AggregateFinanceStatementController.class.php   | 3 ++-
 Application/Admin/View/AggregateFinanceStatement/lists.html    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php
index 693b99842..ea6dd83b4 100644
--- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php
+++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php
@@ -90,13 +90,14 @@ class AggregateFinanceStatementController extends ThinkController
         //分页
         $parameter['p'] = $page;
         $parameter['row'] = $row;
-        $page = set_pagination($count, $row, $parameter);
+        $page = set_pagination($count['count'], $row, $parameter);
         if ($page) {
             $this->assign('_page', $page);
         }
 
 //         $this->meta_title = '结算单管理';
         $this->assign('data',$data);
+        $this->assign('total',$count['ratio_money']);
         $this->assign('channel',$this->getAggChannel());
         $this->assign('verify_status',$this->verify_status);
         $this->display();
diff --git a/Application/Admin/View/AggregateFinanceStatement/lists.html b/Application/Admin/View/AggregateFinanceStatement/lists.html
index b772bdadc..cc620bd31 100644
--- a/Application/Admin/View/AggregateFinanceStatement/lists.html
+++ b/Application/Admin/View/AggregateFinanceStatement/lists.html
@@ -162,7 +162,7 @@
                                 
                             </tr>
                         </volist>
-                        <tr><td>合计</td><td colspan="10">公司对账金额合计：{$sum[1]}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;cp对账金额合计：{$sum[0]+$sum[2]}</td></tr>
+                        <tr><td>合计</td><td colspan="10">对账金额:{$total}</td></tr>
                     </notemtpy>
                     </tbody>
                 </table>