From 908bb504fa412baf3eaa3681f95b8050811fe193 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: Mon, 11 Jul 2022 13:34:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reportFeeBreakdown/reportFeeBreakdown.html         |  3 ---
 .../property/reportFeeSummary/reportFeeSummary.html    |  7 -------
 .../reportFloorUnitFeeSummary.html                     |  3 ---
 .../reportPayFeeDetail/reportPayFeeDetail.html         | 10 +++++++++-
 .../property/reportPayFeeDetail/reportPayFeeDetail.js  |  2 --
 5 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.html b/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.html
index 6c03e32b3..7f78113ba 100755
--- a/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.html
+++ b/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.html
@@ -268,9 +268,6 @@
             </div>
         </div>
     </div>
-    <div class="col-sm-3 float-right">
-        <vc:create path="frame/pagination"></vc:create>
-    </div>
 </div>
 </div>
 </div>
diff --git a/public/pages/property/reportFeeSummary/reportFeeSummary.html b/public/pages/property/reportFeeSummary/reportFeeSummary.html
index f5c2a6048..3c33c0c23 100755
--- a/public/pages/property/reportFeeSummary/reportFeeSummary.html
+++ b/public/pages/property/reportFeeSummary/reportFeeSummary.html
@@ -228,13 +228,6 @@
                         </div>
                     </div>
                 </div>
-                <div><span><vc:i18n name="历史欠费" namespace="reportFeeSummary"></vc:i18n></span>：当月之前欠费；当月应收：当前月收费；当月实收：当月收到中属于当前月应收费用部分；
-                </div>
-                <div><span><vc:i18n name="欠费追回" namespace="reportFeeSummary"></vc:i18n></span>：当月收到中属于历史欠费部分；预交费用：当月收到中属于预交费用部分
-                </div>
-            </div>
-            <div class="col-sm-3 float-right">
-                <vc:create path="frame/pagination"></vc:create>
             </div>
         </div>
     </div>
diff --git a/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.html b/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.html
index 3bc596f11..81284348d 100755
--- a/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.html
+++ b/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.html
@@ -237,9 +237,6 @@
                     </div>
                 </div>
             </div>
-            <div class="col-sm-3 float-right">
-                <vc:create path="frame/pagination"></vc:create>
-            </div>
         </div>
     </div>
 </div>
diff --git a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html
index e3e00f305..6c3ee2188 100755
--- a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html
+++ b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html
@@ -194,6 +194,12 @@
                             <th class="text-center">
                                 <span><vc:i18n name="空置房减免" namespace="reportPayFeeDetail"></vc:i18n></span>(元)
                             </th>
+                            <th class="text-center">
+                                <span><vc:i18n name="面积" namespace="reportPayFeeDetail"></vc:i18n></span>(平方米)
+                            </th>
+                            <th class="text-center">
+                                <span><vc:i18n name="车位" namespace="reportPayFeeDetail"></vc:i18n></span>
+                            </th>
                         </tr>
                         </thead>
                         <tbody>
@@ -219,11 +225,13 @@
                             <td class="text-center">{{fee.lateFee}}</td>
                             <td class="text-center">{{fee.vacantHousingDiscount}}</td>
                             <td class="text-center">{{fee.vacantHousingReduction}}</td>
+                            <td class="text-center">{{fee.builtUpArea}}</td>
+                            <td class="text-center">{{fee.psName}}</td>
                         </tr>
                         </tbody>
                         <tfoot>
                         <tr>
-                            <td colspan="17">
+                            <td colspan="19">
                                 <ul class="pagination float-right"></ul>
                             </td>
                         </tr>
diff --git a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js
index 29d388fcc..4a9e6a7f4 100755
--- a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js
+++ b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js
@@ -146,8 +146,6 @@
                     param,
                     function (json, res) {
                         var _reportPayFeeDetailInfo = JSON.parse(json);
-                        console.log("hello")
-                        console.log(_reportPayFeeDetailInfo)
                         vc.component.reportPayFeeDetailInfo.total = _reportPayFeeDetailInfo.total;
                         vc.component.reportPayFeeDetailInfo.records = _reportPayFeeDetailInfo.records;
                         vc.component.reportPayFeeDetailInfo.fees = _reportPayFeeDetailInfo.data;