From daa98b5ac6ac5b8d97f7c73b3bfa0901ad268fdb Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Sun, 18 Feb 2024 16:28:16 +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

---
 .../ownerDetailRoomFee.html                   | 34 ++++++++-----------
 .../ownerDetailRoomFee/ownerDetailRoomFee.js  |  4 +--
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/public/components/owner/ownerDetailRoomFee/ownerDetailRoomFee.html b/public/components/owner/ownerDetailRoomFee/ownerDetailRoomFee.html
index 2d47d1ca7..6011f30b9 100644
--- a/public/components/owner/ownerDetailRoomFee/ownerDetailRoomFee.html
+++ b/public/components/owner/ownerDetailRoomFee/ownerDetailRoomFee.html
@@ -2,12 +2,12 @@
     <div class="row margin-top-lg">
         <div class="col-lg-4 padding-right-xs padding-left-xl">
             <span class="margin-right" v-for="(item,index) in ownerDetailRoomFeeInfo.payObjs">
-                <input type="checkbox" class="i-checks checkRoomItem" v-bind:value="item.roomId" 
-                v-model="ownerDetailRoomFeeInfo.payerObjIds" 
-                @change="_chanagePayerObjId()"> {{item.floorNum}}-{{item.unitNum}}-{{item.roomNum}}
+                <input type="checkbox" class="i-checks checkRoomItem" v-bind:value="item.roomId"
+                    v-model="ownerDetailRoomFeeInfo.payerObjIds" @change="_chanagePayerObjId()">
+                {{item.floorNum}}-{{item.unitNum}}-{{item.roomNum}}
             </span>
         </div>
-        <div class="col-lg-1 padding-lr-xs" >
+        <div class="col-lg-1 padding-lr-xs">
             <select class="custom-select custom-select-sm" v-model="ownerDetailRoomFeeInfo.state"
                 @change="_changeContractConfigId()">
                 <option selected value="">{{vc.i18n('请选择状态','ownerDetailRoomFee')}}</option>
@@ -18,11 +18,10 @@
         <div class="col-lg-7 text-right">
             <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
                 v-if="vc.hasPrivilege('502020082314267912')" v-on:click="_openBatchPayRoomFeeModal()">
-                    <vc:i18n name="批量缴费" namespace="ownerDetailRoomFee"></vc:i18n>
+                <vc:i18n name="批量缴费" namespace="ownerDetailRoomFee"></vc:i18n>
             </button>
             <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-            v-if="vc.hasPrivilege('502022073007100003')"
-                v-on:click="_openTempImportRoomFeeModal()">
+                v-if="vc.hasPrivilege('502022073007100003')" v-on:click="_openTempImportRoomFeeModal()">
                 临时收费
             </button>
             <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
@@ -30,13 +29,11 @@
                 <vc:i18n name="按量缴费" namespace="ownerDetailRoomFee"></vc:i18n>
             </button>
             <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-            v-if="vc.hasPrivilege('502022073096990007')"
-                v-on:click="_openRoomsCreateFeeModal()" >
+                v-if="vc.hasPrivilege('502022073096990007')" v-on:click="_openRoomsCreateFeeModal()">
                 创建费用
             </button>
             <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-            v-if="vc.hasPrivilege('502020080570210194')" 
-             v-on:click="_toRoomOwePayFee()">
+                v-if="vc.hasPrivilege('502020080570210194')" v-on:click="_toRoomOwePayFee()">
                 欠费缴费
             </button>
             <button type="button" class="btn btn-white btn-sm" style="margin-left:10px" v-on:click="_printOwnOrder()">
@@ -123,7 +120,9 @@
                             </span>{{_getRoomAttrValue(fee.feeAttrs,'390003')}}</div>
                     </td>
                     <td class="text-center" width="150" v-else-if="fee.computingFormula == '4004'">
-                        <div><vc:i18n name="费用根据实际情况而定" namespace="ownerDetailRoomFee"></vc:i18n></div>
+                        <div>
+                            <vc:i18n name="费用根据实际情况而定" namespace="ownerDetailRoomFee"></vc:i18n>
+                        </div>
                     </td>
                     <td class="text-center" v-else>
                         <div><span>
@@ -176,12 +175,9 @@
             </div>
             <div class="col-sm-2">
                 <span>
-                    <span>
-                        <span>
-                            <vc:i18n name="欠费小计" namespace="ownerDetailRoomFee"></vc:i18n>
-                        </span>
-                    </span>：{{ownerDetailRoomFeeInfo.totalAmount}}
+                    <vc:i18n name="欠费小计：" namespace="ownerDetailRoomFee"></vc:i18n>
                 </span>
+                {{ownerDetailRoomFeeInfo.totalAmount}}
             </div>
             <div class="col-sm-6">
                 <vc:create namespace="ownerDetailRoomFee" path="frame/paginationPlus"></vc:create>
@@ -192,6 +188,6 @@
     <vc:create path="fee/roomsImportTempFee"></vc:create>
     <vc:create path="fee/roomsCreateFee"></vc:create>
     <vc:create path="fee/roomsProxyFee"></vc:create>
-   
-   
+
+
 </div>
\ No newline at end of file
diff --git a/public/components/owner/ownerDetailRoomFee/ownerDetailRoomFee.js b/public/components/owner/ownerDetailRoomFee/ownerDetailRoomFee.js
index aa4dfcdbd..822edd82e 100644
--- a/public/components/owner/ownerDetailRoomFee/ownerDetailRoomFee.js
+++ b/public/components/owner/ownerDetailRoomFee/ownerDetailRoomFee.js
@@ -3,7 +3,7 @@
  **/
 (function (vc) {
     var DEFAULT_PAGE = 1;
-    var DEFAULT_ROWS = 10;
+    var DEFAULT_ROWS = 30;
     vc.extends({
         data: {
             ownerDetailRoomFeeInfo: {
@@ -52,7 +52,7 @@
                         $that.ownerDetailRoomFeeInfo.total = _feeConfigInfo.total;
                         $that.ownerDetailRoomFeeInfo.records = _feeConfigInfo.records;
                         $that.ownerDetailRoomFeeInfo.fees = _feeConfigInfo.fees;
-                        vc.emit('pagination', 'init', {
+                        vc.emit('ownerDetailRoomFee','paginationPlus', 'init', {
                             total: _feeConfigInfo.records,
                             currentPage: _page
                         });