From 15850bec700828cc5f8a364e5cdcb2096708ee28 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 7 Jul 2022 19:19:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E6=B1=87=E6=80=BB=E8=A1=A8?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/indexNotice/indexNotice.html     | 20 +++++++++----------
 .../reportFeeSummaryDetail.html               | 20 +++++++++++++------
 .../reportFeeSummaryDetail.js                 |  2 +-
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/public/components/property/indexNotice/indexNotice.html b/public/components/property/indexNotice/indexNotice.html
index 189432207..39390b1a4 100644
--- a/public/components/property/indexNotice/indexNotice.html
+++ b/public/components/property/indexNotice/indexNotice.html
@@ -1,7 +1,15 @@
 <div class="index-1-right-1">
     <div class="index-title"><span>小区公告</span></div>
-    <ul >
-        <li class="flex justify-between padding-top-sm" v-for="(item,index) in indexNoticeInfo.notices" v-if="indexNoticeInfo.notices && indexNoticeInfo.notices.length>0">
+    <ul>
+        <li class="flex justify-between padding-top-sm" v-if="!indexNoticeInfo.notices || indexNoticeInfo.notices.length < 1">
+            <div class="vc-index-notice-title">
+                当前没有公告信息
+            </div>
+            <div class="vc-index-notice-time">
+
+            </div>
+        </li>
+        <li class="flex justify-between padding-top-sm" v-for="(item,index) in indexNoticeInfo.notices" v-else>
             <div class="vc-index-notice-title">
                 {{item.title}}
             </div>
@@ -10,13 +18,5 @@
             </div>
         </li>
 
-        <li class="flex justify-between padding-top-sm" v-else >
-            <div class="vc-index-notice-title">
-                当前没有公告信息
-            </div>
-            <div class="vc-index-notice-time">
-                
-            </div>
-        </li>
     </ul>
 </div>
\ No newline at end of file
diff --git a/public/pages/property/reportFeeSummaryDetail/reportFeeSummaryDetail.html b/public/pages/property/reportFeeSummaryDetail/reportFeeSummaryDetail.html
index 4fe1e9da6..41cb5008a 100644
--- a/public/pages/property/reportFeeSummaryDetail/reportFeeSummaryDetail.html
+++ b/public/pages/property/reportFeeSummaryDetail/reportFeeSummaryDetail.html
@@ -17,6 +17,12 @@
                                 <th class="text-center">
                                     <span><vc:i18n name="日期" namespace="reportFeeSummaryDetail"></vc:i18n></span>
                                 </th>
+                                <th class="text-center">
+                                    <span><vc:i18n name="房号/车辆/合同" namespace="reportFeeSummaryDetail"></vc:i18n></span>
+                                </th>
+                                <th class="text-center">
+                                    <span><vc:i18n name="费用项" namespace="reportFeeSummaryDetail"></vc:i18n></span>
+                                </th>
                                 <th class="text-center">
                                     <span><vc:i18n name="历史欠费" namespace="reportFeeSummaryDetail"></vc:i18n></span>(单位:元)
                                 </th>
@@ -49,6 +55,8 @@
                         <tbody>
                             <tr v-for="fee in reportFeeSummaryDetailInfo.fees">
                                 <td class="text-center">{{fee.feeYear+'年'+fee.feeMonth+'月'}}</td>
+                                <td class="text-center">{{fee.objName}}</td>
+                                <td class="text-center">{{fee.feeName}}</td>
                                 <td class="text-center">{{fee.hisOweAmount}}</td>
                                 <td class="text-center">{{fee.curReceivableAmount}}</td>
                                 <td class="text-center">{{_computeSum(fee.hisOweAmount,fee.curReceivableAmount)}}</td>
@@ -72,15 +80,15 @@
                     </table>
                     <!-- 分页 -->
                     <!-- 分页 -->
-                </div>
-                <div class="row margin-top-xs">
-                    <div class="col-sm-3 float-right">
-                        <vc:create path="frame/pagination"></vc:create>
+
+                    <div class="row margin-top-xs">
+                        <div class="col-sm-12 float-right">
+                            <vc:create path="frame/pagination"></vc:create>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
-<vc:create path="property/searchFloor" emitChooseFloor="reportFeeSummaryDetail" emitLoadData="xx"></vc:create>
+    <vc:create path="property/searchFloor" emitChooseFloor="reportFeeSummaryDetail" emitLoadData="xx"></vc:create>
 </div>
\ No newline at end of file
diff --git a/public/pages/property/reportFeeSummaryDetail/reportFeeSummaryDetail.js b/public/pages/property/reportFeeSummaryDetail/reportFeeSummaryDetail.js
index beb714bbb..a6d138f12 100644
--- a/public/pages/property/reportFeeSummaryDetail/reportFeeSummaryDetail.js
+++ b/public/pages/property/reportFeeSummaryDetail/reportFeeSummaryDetail.js
@@ -3,7 +3,7 @@
  **/
 (function(vc) {
     var DEFAULT_PAGE = 1;
-    var DEFAULT_ROWS = 10;
+    var DEFAULT_ROWS = 20;
     vc.extends({
         data: {
             reportFeeSummaryDetailInfo: {