From ec336dd97cfa83cbc390336c2835aa549f7fab0f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sun, 14 Nov 2021 14:10:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commonReportTable/commonReportTable.html  | 13 +++++-
 .../commonReportTable/commonReportTable.js    | 43 ++++++++++++++++++-
 .../reportCustomComponentFooterManage.html    |  4 ++
 .../reportCustomComponentFooterManage.js      |  3 ++
 4 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/public/components/property/commonReportTable/commonReportTable.html b/public/components/property/commonReportTable/commonReportTable.html
index 2dc5a67e8..af19dfe0b 100644
--- a/public/components/property/commonReportTable/commonReportTable.html
+++ b/public/components/property/commonReportTable/commonReportTable.html
@@ -42,7 +42,7 @@
                             </tr>
                         </thead>
                         <tbody>
-                            <tr v-for="(itemData,indexData) in item.data" >
+                            <tr v-for="(itemData,indexData) in item.data">
                                 <td class="text-center" v-for="(tmpItemTh,key) in item.th">
                                     {{itemData[tmpItemTh]}}</td>
                             </tr>
@@ -55,8 +55,17 @@
                             </tr>
                         </tfoot>
                     </table>
+                    <div class="row padding-left" v-if="item.footer">
+                        <span class="col-md-2" v-for="(tmpItemTh,key) of item.footer">
+                            <div class="row">{{key}}: {{tmpItemTh}}</div>
+                        </span>
+                    </div>
                     <!-- 分页 -->
-                    <vc:create path="frame/paginationPlus" namespace="commonReportTable"></vc:create>
+                    <div class="row">
+                        <div class="col-md-12 text-center">
+                            <vc:create path="frame/paginationPlus" namespace="commonReportTable"></vc:create>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/public/components/property/commonReportTable/commonReportTable.js b/public/components/property/commonReportTable/commonReportTable.js
index 5788a1860..da618fe59 100644
--- a/public/components/property/commonReportTable/commonReportTable.js
+++ b/public/components/property/commonReportTable/commonReportTable.js
@@ -33,6 +33,7 @@
                 })
 
                 $that._listReportCustomTableDatas(1, 15, item, _condition);
+                $that._listReportCustomTableFooter(1, 15, item, _condition);
             },
             _listReportCustomTableComponent: function () {
                 var param = {
@@ -52,6 +53,7 @@
                         $that.commonReportTableInfo.components.forEach(item => {
                             $that._listReportCustomTableConditions(item);
                             $that._listReportCustomTableDatas(1, 15, item);
+                            $that._listReportCustomTableFooter(1, 15, item);
                         });
                     }, function (errInfo, error) {
                         console.log('请求失败处理');
@@ -75,7 +77,7 @@
                         _component.conditions = _componentConditionManageInfo.data;
                         $that.$forceUpdate();
                         //处理日期类型
-                        
+
                     }, function (errInfo, error) {
                         console.log('请求失败处理');
                     }
@@ -126,6 +128,45 @@
                         console.log('请求失败处理');
                     }
                 );
+            },
+            _listReportCustomTableFooter: function (_page, _row, _component, _conditions) {
+                let _community = vc.getCurrentCommunity();
+                let _communityId = '';
+                if (_community) {
+                    _communityId = _community.communityId
+                }
+                if (_conditions) {
+                    _conditions.page = _page;
+                    _conditions.row = _row;
+                    _conditions.componentId = _component.componentId;
+                    _conditions.communityId = _communityId
+                } else {
+                    _conditions = {
+                        page: _page,
+                        row: _row,
+                        componentId: _component.componentId,
+                        communityId: _communityId
+                    }
+                }
+                let param = {
+                    params: _conditions
+                };
+
+                //发送get请求
+                vc.http.apiGet('/reportCustomComponent.listReportCustomComponentDataFooter',
+                    param,
+                    function (json, res) {
+                        let _componentDataManageInfo = JSON.parse(json);
+                        if (_componentDataManageInfo.code != 0) {
+                            return;
+                        }
+                        let _data = _componentDataManageInfo.data;
+                        _component.footer = _data;
+                        $that.$forceUpdate();
+                    }, function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
             }
         }
     });
diff --git a/public/pages/dev/reportCustomComponentFooterManage/reportCustomComponentFooterManage.html b/public/pages/dev/reportCustomComponentFooterManage/reportCustomComponentFooterManage.html
index 79bbbea6e..92aeedea8 100644
--- a/public/pages/dev/reportCustomComponentFooterManage/reportCustomComponentFooterManage.html
+++ b/public/pages/dev/reportCustomComponentFooterManage/reportCustomComponentFooterManage.html
@@ -5,6 +5,10 @@
                 <div class="ibox-title">
                     <h5>{{reportCustomComponentFooterManageInfo.componentName}}统计</h5>
                     <div class="ibox-tools" style="top:10px;">
+                        <button type="button" class="btn btn-white btn-sm"
+                            v-on:click="_goBack()">
+                            返回
+                        </button>
                         <button type="button" class="btn btn-primary btn-sm"
                             v-on:click="_openAddReportCustomComponentFooterModal()">
                             <i class="glyphicon glyphicon-plus"></i>
diff --git a/public/pages/dev/reportCustomComponentFooterManage/reportCustomComponentFooterManage.js b/public/pages/dev/reportCustomComponentFooterManage/reportCustomComponentFooterManage.js
index d30a259aa..b0cbfdb57 100644
--- a/public/pages/dev/reportCustomComponentFooterManage/reportCustomComponentFooterManage.js
+++ b/public/pages/dev/reportCustomComponentFooterManage/reportCustomComponentFooterManage.js
@@ -74,6 +74,9 @@
             _queryReportCustomComponentFooterMethod: function () {
                 vc.component._listReportCustomComponentFooters(DEFAULT_PAGE, DEFAULT_ROWS);
             },
+            _goBack:function(){
+                vc.goBack();
+            },
             _moreCondition: function () {
                 if (vc.component.reportCustomComponentFooterManageInfo.moreCondition) {
                     vc.component.reportCustomComponentFooterManageInfo.moreCondition = false;