From d91282fc41ab1e32aa6a195ba903e40eefec1163 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: Thu, 12 Aug 2021 22:49:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/components/property/addMeterWater/addMeterWater.js       | 1 +
 .../applyRoomDiscountManage/applyRoomDiscountManage.html        | 2 +-
 .../feeCollectionDetailManage/feeCollectionDetailManage.html    | 2 +-
 public/pages/property/listOweFee/listOweFee.js                  | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/public/components/property/addMeterWater/addMeterWater.js b/public/components/property/addMeterWater/addMeterWater.js
index 98edc47b0..92f0e0429 100755
--- a/public/components/property/addMeterWater/addMeterWater.js
+++ b/public/components/property/addMeterWater/addMeterWater.js
@@ -221,6 +221,7 @@
                             vc.emit('listParkingSpaceFee', 'notify', {});
                             vc.emit('simplifyRoomFee', 'notify', {});
                             vc.emit('simplifyCarFee', 'notify', {});
+                            vc.emit('addMeterWater', 'floorSelect2', 'clearFloor', {});
                             return;
                         }
                         vc.message(_json.msg);
diff --git a/public/pages/property/applyRoomDiscountManage/applyRoomDiscountManage.html b/public/pages/property/applyRoomDiscountManage/applyRoomDiscountManage.html
index 659ef60b3..a9752afb1 100755
--- a/public/pages/property/applyRoomDiscountManage/applyRoomDiscountManage.html
+++ b/public/pages/property/applyRoomDiscountManage/applyRoomDiscountManage.html
@@ -88,7 +88,7 @@
                             <td class="text-center">{{applyRoomDiscount.startTime}}</td>
                             <td class="text-center">{{applyRoomDiscount.endTime}}</td>
                             <td class="text-center">{{applyRoomDiscount.stateName}}</td>
-                            <td class="text-center">{{applyRoomDiscount.isUse == '0' ? '未使用' : '已使用'}}</td>
+                            <td class="text-center">{{applyRoomDiscount.inUse == '0' ? '未使用' : '已使用'}}</td>
                             <td class="text-center">
                                 <div class="btn-group"
                                      v-if="applyRoomDiscount.state == '1' && vc.hasPrivilege('502021010723590006')">
diff --git a/public/pages/property/feeCollectionDetailManage/feeCollectionDetailManage.html b/public/pages/property/feeCollectionDetailManage/feeCollectionDetailManage.html
index a48e87c7e..4be6863f2 100644
--- a/public/pages/property/feeCollectionDetailManage/feeCollectionDetailManage.html
+++ b/public/pages/property/feeCollectionDetailManage/feeCollectionDetailManage.html
@@ -79,7 +79,7 @@
                                 <td class="text-center">{{feeCollectionDetail.collectionWay == '001' ? '仅短信方式' : (feeCollectionDetail.collectionWay == '002' ? '短信微信方式' : '仅微信方式')}}</td>
                                 <td class="text-center">{{feeCollectionDetail.oweAmount}}</td>
                                 <td class="text-center">{{feeCollectionDetail.createTime}}</td>
-                                <td class="text-center">{{feeCollectionDetail.state}}</td>
+                                <td class="text-center">{{feeCollectionDetail.state == 'F' ? '催缴成功' : '催缴失败'}}</td>
                                 <td class="text-center">{{feeCollectionDetail.remarks}}</td>
                             </tr>
                         </tbody>
diff --git a/public/pages/property/listOweFee/listOweFee.js b/public/pages/property/listOweFee/listOweFee.js
index d83b7d113..ca4866a83 100755
--- a/public/pages/property/listOweFee/listOweFee.js
+++ b/public/pages/property/listOweFee/listOweFee.js
@@ -15,7 +15,7 @@
                 conditions: {
                     floorName: '',
                     configIds: '',
-                    payObjType: '3333',
+                    payObjType: '',
                     num: '',
                     billType: '00123'
                 },