From b31e22d7226683f470a49299dac4c3acbed6b54b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Tue, 15 Sep 2020 21:29:58 +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

---
 public/pages/property/listRoomFee/listRoomFee.html | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/public/pages/property/listRoomFee/listRoomFee.html b/public/pages/property/listRoomFee/listRoomFee.html
index fe80ead91..4219f008a 100644
--- a/public/pages/property/listRoomFee/listRoomFee.html
+++ b/public/pages/property/listRoomFee/listRoomFee.html
@@ -53,7 +53,7 @@
                                 <td class="text-center">{{fee.amountOwed}}</td>
                                 <td class="text-center">{{fee.startTime}}</td>
                                 <td class="text-center">{{fee.endTime}}</td>
-                                <td class="text-center" v-if="fee.amountOwed == 0 && fee.endTime == fee.deadlineTime">-</td>
+                                <td class="text-center" v-if="fee.amountOwed == 0 && fee.endTime == fee.deadlineTime && fee.state == '2008001'">-</td>
                                
                                 <td class="text-center" v-else>{{fee.deadlineTime}}</td>
                                 <td class="text-center" v-if="fee.feeTypeCd == '888800010015' || fee.feeTypeCd == '888800010016' ">
@@ -94,7 +94,16 @@
                         </tbody>
                     </table>
                     <!-- 分页 -->
-                    <vc:create path="frame/pagination"></vc:create>
+                    <div class="row">
+                        <div class="col-sm-4">
+                            <span> 注意： 计费结束时间 “-” 表示未到计费时间</span>
+                        </div>
+                        <div class="col-sm-8 float-right">
+                            <vc:create path="frame/pagination"></vc:create>
+                        </div>
+                    </div>
+
+                    
 
                 </div>
             </div>