From c7499a024594f897a95da42cf2e914deefcda519 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sat, 2 Apr 2022 11:17:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/carCreateFee/carCreateFee.js     |  2 +-
 .../contractCreateFee/contractCreateFee.js    |  5 +-
 .../reportDeadlineFee/reportDeadlineFee.html  | 56 +++++------
 .../reportFeeBreakdown.html                   | 82 ++++++++--------
 .../reportFeeDetail/reportFeeDetail.html      |  1 +
 .../reportFeeSummary/reportFeeSummary.html    |  1 +
 .../reportFloorUnitFeeSummary.html            | 94 +++++++++----------
 .../reportOweFeeDetail.html                   | 85 ++++++++---------
 .../reportPrePaymentFee.html                  | 39 ++++----
 .../property/roomCreateFee/roomCreateFee.js   |  3 +-
 10 files changed, 174 insertions(+), 194 deletions(-)

diff --git a/public/pages/property/carCreateFee/carCreateFee.js b/public/pages/property/carCreateFee/carCreateFee.js
index 065f46418..b71a35848 100755
--- a/public/pages/property/carCreateFee/carCreateFee.js
+++ b/public/pages/property/carCreateFee/carCreateFee.js
@@ -58,7 +58,7 @@
                 //业主名称选框去空
                 param.params.ownerName = param.params.ownerName.trim();
                 //发送get请求
-                vc.http.apiGet('owner.queryOwnerCars',
+                vc.http.apiGet('/owner.queryOwnerCars',
                     param,
                     function(json, res) {
                         var listCarData = JSON.parse(json);
diff --git a/public/pages/property/contractCreateFee/contractCreateFee.js b/public/pages/property/contractCreateFee/contractCreateFee.js
index c0cb7d712..124a13ac4 100755
--- a/public/pages/property/contractCreateFee/contractCreateFee.js
+++ b/public/pages/property/contractCreateFee/contractCreateFee.js
@@ -97,9 +97,8 @@
                     vc.component.contractCreateFeeInfo.moreCondition = true;
                 }
             },
-            _toOwnerPayFee: function(_room) {
-                let roomName = _room.floorNum + "栋" + _room.unitNum + "单元" + _room.roomNum + "室"
-                vc.jumpToPage('/#/pages/property/owePayFeeOrder?payObjId=' + _room.roomId + "&payObjType=9999&roomName=" + roomName);
+            _toOwnerPayFee: function(_ContractFeeInfo) {
+                vc.jumpToPage('/#/pages/property/owePayFeeOrder?payObjId=' + _ContractFeeInfo.contractId + '&payObjType=7777&contractName=' + _ContractFeeInfo.contractName);
             },
             _printOwnOrder: function(_room) {
                 //打印催交单
diff --git a/public/pages/property/reportDeadlineFee/reportDeadlineFee.html b/public/pages/property/reportDeadlineFee/reportDeadlineFee.html
index 603413df2..3d7ba4de4 100755
--- a/public/pages/property/reportDeadlineFee/reportDeadlineFee.html
+++ b/public/pages/property/reportDeadlineFee/reportDeadlineFee.html
@@ -9,11 +9,9 @@
                     <div class="row">
                         <div class="col-sm-4">
                             <div class="form-group input-group">
-                                <input type="text" placeholder="请选择楼栋"
-                                       v-model="reportDeadlineFeeInfo.conditions.floorName" class=" form-control">
+                                <input type="text" placeholder="请选择楼栋" v-model="reportDeadlineFeeInfo.conditions.floorName" class=" form-control">
                                 <div class="input-group-prepend">
-                                    <button type="button" class="btn btn-primary btn-sm"
-                                            v-on:click="_openChooseFloorMethod()">
+                                    <button type="button" class="btn btn-primary btn-sm" v-on:click="_openChooseFloorMethod()">
                                         <i class="fa fa-search"></i> 选择
                                     </button>
                                 </div>
@@ -21,8 +19,7 @@
                         </div>
                         <div class="col-sm-3">
                             <div class="form-group">
-                                <select class="form-control-md form-control input-s-sm inline"
-                                        v-model="reportDeadlineFeeInfo.conditions.unitId">
+                                <select class="form-control-md form-control input-s-sm inline" v-model="reportDeadlineFeeInfo.conditions.unitId">
                                     <option selected value="">请选择单元</option>
                                     <option v-for="(unit,index) in reportDeadlineFeeInfo.roomUnits" :key="index"
                                             v-bind:value="unit.unitId">
@@ -33,16 +30,14 @@
                         </div>
                         <div class="col-sm-3">
                             <div class="form-group">
-                                <input type="text" placeholder="请填写房屋编号" class="form-control form-control-md"
-                                       v-model="reportDeadlineFeeInfo.conditions.roomNum">
+                                <input type="text" placeholder="请填写房屋编号" class="form-control form-control-md" v-model="reportDeadlineFeeInfo.conditions.roomNum">
                             </div>
                         </div>
                         <div class="col-sm-2">
                             <button type="button" class="btn btn-primary btn-md" v-on:click="_queryMethod()">
                                 <i class="fa fa-search"></i> 查询
                             </button>
-                            <button type="button" class="btn btn-info btn-md" v-on:click="_resetMethod()"
-                                    style="margin-left: 20px;">
+                            <button type="button" class="btn btn-info btn-md" v-on:click="_resetMethod()" style="margin-left: 20px;">
                                 <i class="fa fa-repeat"></i>重置
                             </button>
                         </div>
@@ -56,6 +51,7 @@
             <div class="ibox">
                 <div class="ibox-title">
                     <h5>费用到期提醒</h5>
+                    <span style="font-size: 10px;">(按天更新)</span>
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_exportExcel()">
                             <i class="fa fa-plus"></i>导出
@@ -65,30 +61,30 @@
                 <div class="ibox-content">
                     <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                         <thead>
-                        <tr>
-                            <!-- <th class="text-center">信息ID</th> -->
-                            <th class="text-center">费用编号</th>
-                            <th class="text-center">房号</th>
-                            <th class="text-center">费用项</th>
-                            <th class="text-center">费用结束时间</th>
-                            <th class="text-center">距离费用结束时间（天）</th>
-                        </tr>
+                            <tr>
+                                <!-- <th class="text-center">信息ID</th> -->
+                                <th class="text-center">费用编号</th>
+                                <th class="text-center">房号</th>
+                                <th class="text-center">费用项</th>
+                                <th class="text-center">费用结束时间</th>
+                                <th class="text-center">距离费用结束时间（天）</th>
+                            </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="(fee,index) in reportDeadlineFeeInfo.fees">
-                            <td class="text-center">{{index+1}}</td>
-                            <td class="text-center">{{fee.objName}}</td>
-                            <td class="text-center">{{fee.feeName}}</td>
-                            <td class="text-center">{{fee.deadlineTime}}</td>
-                            <td class="text-center">{{fee.oweDay}}</td>
-                        </tr>
+                            <tr v-for="(fee,index) in reportDeadlineFeeInfo.fees">
+                                <td class="text-center">{{index+1}}</td>
+                                <td class="text-center">{{fee.objName}}</td>
+                                <td class="text-center">{{fee.feeName}}</td>
+                                <td class="text-center">{{fee.deadlineTime}}</td>
+                                <td class="text-center">{{fee.oweDay}}</td>
+                            </tr>
                         </tbody>
                         <tfoot>
-                        <tr>
-                            <td colspan="7">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
+                            <tr>
+                                <td colspan="7">
+                                    <ul class="pagination float-right"></ul>
+                                </td>
+                            </tr>
                         </tfoot>
                     </table>
                     <!-- 分页 -->
diff --git a/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.html b/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.html
index e3aca5ef1..61e188721 100755
--- a/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.html
+++ b/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.html
@@ -14,11 +14,9 @@
                     <div class="row">
                         <div class="col-sm-4">
                             <div class="form-group input-group">
-                                <input type="text" placeholder="请选择楼栋"
-                                       v-model="reportFeeBreakdownInfo.conditions.floorName" class=" form-control">
+                                <input type="text" placeholder="请选择楼栋" v-model="reportFeeBreakdownInfo.conditions.floorName" class=" form-control">
                                 <div class="input-group-prepend">
-                                    <button type="button" class="btn btn-primary btn-sm"
-                                            v-on:click="_openChooseFloorMethod()">
+                                    <button type="button" class="btn btn-primary btn-sm" v-on:click="_openChooseFloorMethod()">
                                         <i class="fa fa-search"></i> 选择
                                     </button>
                                 </div>
@@ -26,8 +24,7 @@
                         </div>
                         <div class="col-sm-3">
                             <div class="form-group">
-                                <select class="form-control-md form-control input-s-sm inline"
-                                        v-model="reportFeeBreakdownInfo.conditions.unitId">
+                                <select class="form-control-md form-control input-s-sm inline" v-model="reportFeeBreakdownInfo.conditions.unitId">
                                     <option selected value="">请选择单元</option>
                                     <option v-for="(unit,index) in reportFeeBreakdownInfo.roomUnits" :key="index"
                                             v-bind:value="unit.unitId">
@@ -38,16 +35,14 @@
                         </div>
                         <div class="col-sm-3">
                             <div class="form-group">
-                                <input type="text" placeholder="请填写年份月份，如202109" class="form-control form-control-md"
-                                       v-model="reportFeeBreakdownInfo.conditions.yearMonth">
+                                <input type="text" placeholder="请填写年份月份，如202109" class="form-control form-control-md" v-model="reportFeeBreakdownInfo.conditions.yearMonth">
                             </div>
                         </div>
                         <div class="col-sm-2">
                             <button type="button" class="btn btn-primary btn-md" v-on:click="_queryMethod()">
                                 <i class="fa fa-search"></i> 查询
                             </button>
-                            <button type="button" class="btn btn-info btn-md" v-on:click="_resetMethod()"
-                                    style="margin-left: 20px;">
+                            <button type="button" class="btn btn-info btn-md" v-on:click="_resetMethod()" style="margin-left: 20px;">
                                 <i class="fa fa-repeat"></i> 重置
                             </button>
                         </div>
@@ -100,6 +95,7 @@
             <div class="ibox">
                 <div class="ibox-title">
                     <h5>费用分项表</h5>
+                    <span style="font-size: 10px;">(按天更新)</span>
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_exportExcel()">
                             <i class="fa fa-plus"></i>导出
@@ -109,43 +105,43 @@
                 <div class="ibox-content">
                     <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                         <thead>
-                        <tr>
-                            <th class="text-center">费用编号</th>
-                            <th class="text-center">费用类型</th>
-                            <th class="text-center">费用项</th>
-                            <th class="text-center">历史欠费(单位:元)</th>
-                            <th class="text-center">当月应收(单位:元)</th>
-                            <th class="text-center">应收合计(单位:元)</th>
-                            <th class="text-center">当月实收(单位:元)</th>
-                            <th class="text-center">欠费追回(单位:元)</th>
-                            <th class="text-center">预交费用(单位:元)</th>
-                            <th class="text-center">实收合计(单位:元)</th>
-                            <th class="text-center">欠费金额(单位:元)</th>
-                            <th class="text-center">更新时间</th>
-                        </tr>
+                            <tr>
+                                <th class="text-center">费用编号</th>
+                                <th class="text-center">费用类型</th>
+                                <th class="text-center">费用项</th>
+                                <th class="text-center">历史欠费(单位:元)</th>
+                                <th class="text-center">当月应收(单位:元)</th>
+                                <th class="text-center">应收合计(单位:元)</th>
+                                <th class="text-center">当月实收(单位:元)</th>
+                                <th class="text-center">欠费追回(单位:元)</th>
+                                <th class="text-center">预交费用(单位:元)</th>
+                                <th class="text-center">实收合计(单位:元)</th>
+                                <th class="text-center">欠费金额(单位:元)</th>
+                                <th class="text-center">更新时间</th>
+                            </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="(fee,index) in reportFeeBreakdownInfo.fees">
-                            <td class="text-center">{{index+1}}</td>
-                            <td class="text-center">{{fee.feeTypeCd}}</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>
-                            <td class="text-center">{{fee.curReceivedAmount}}</td>
-                            <td class="text-center">{{fee.hisOweReceivedAmount}}</td>
-                            <td class="text-center">{{fee.preReceivedAmount}}</td>
-                            <td class="text-center">{{_computeSum(_computeSum(fee.hisOweReceivedAmount,fee.preReceivedAmount),fee.curReceivedAmount)}}</td>
-                            <td class="text-center">{{_computeOweFee(fee)}}</td>
-                            <td class="text-center">{{fee.updateTime}}</td>
-                        </tr>
+                            <tr v-for="(fee,index) in reportFeeBreakdownInfo.fees">
+                                <td class="text-center">{{index+1}}</td>
+                                <td class="text-center">{{fee.feeTypeCd}}</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>
+                                <td class="text-center">{{fee.curReceivedAmount}}</td>
+                                <td class="text-center">{{fee.hisOweReceivedAmount}}</td>
+                                <td class="text-center">{{fee.preReceivedAmount}}</td>
+                                <td class="text-center">{{_computeSum(_computeSum(fee.hisOweReceivedAmount,fee.preReceivedAmount),fee.curReceivedAmount)}}</td>
+                                <td class="text-center">{{_computeOweFee(fee)}}</td>
+                                <td class="text-center">{{fee.updateTime}}</td>
+                            </tr>
                         </tbody>
                         <tfoot>
-                        <tr>
-                            <td colspan="7">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
+                            <tr>
+                                <td colspan="7">
+                                    <ul class="pagination float-right"></ul>
+                                </td>
+                            </tr>
                         </tfoot>
                     </table>
                     <!-- 分页 -->
diff --git a/public/pages/property/reportFeeDetail/reportFeeDetail.html b/public/pages/property/reportFeeDetail/reportFeeDetail.html
index c6c396004..256ee8e6c 100755
--- a/public/pages/property/reportFeeDetail/reportFeeDetail.html
+++ b/public/pages/property/reportFeeDetail/reportFeeDetail.html
@@ -78,6 +78,7 @@
             <div class="ibox">
                 <div class="ibox-title">
                     <h5>费用明细表</h5>
+                    <span style="font-size: 10px;">(按天更新)</span>
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_exportFee()">
                             <i class="fa fa-plus"></i>导出
diff --git a/public/pages/property/reportFeeSummary/reportFeeSummary.html b/public/pages/property/reportFeeSummary/reportFeeSummary.html
index aaef31ae4..e5f732955 100755
--- a/public/pages/property/reportFeeSummary/reportFeeSummary.html
+++ b/public/pages/property/reportFeeSummary/reportFeeSummary.html
@@ -76,6 +76,7 @@
             <div class="ibox">
                 <div class="ibox-title">
                     <h5>费用汇总表</h5>
+                    <span style="font-size: 10px;">(按天更新)</span>
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_exportExcel()">
                             <i class="fa fa-plus"></i>导出
diff --git a/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.html b/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.html
index 1ad12461d..9c09ac3db 100755
--- a/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.html
+++ b/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.html
@@ -5,19 +5,16 @@
                 <div class="ibox-title">
                     <h5>查询条件</h5>
                     <div class="ibox-tools" style="top:10px;">
-                      
+
                     </div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
                         <div class="col-sm-3">
                             <div class="form-group input-group">
-                                <input type="text" placeholder="请选择楼栋"
-                                       v-model="reportFloorUnitFeeSummaryInfo.conditions.floorName"
-                                       class=" form-control">
+                                <input type="text" placeholder="请选择楼栋" v-model="reportFloorUnitFeeSummaryInfo.conditions.floorName" class=" form-control">
                                 <div class="input-group-prepend">
-                                    <button type="button" class="btn btn-primary btn-sm"
-                                            v-on:click="_openChooseFloorMethod()">
+                                    <button type="button" class="btn btn-primary btn-sm" v-on:click="_openChooseFloorMethod()">
                                         <i class="fa fa-search"></i> 选择
                                     </button>
                                 </div>
@@ -25,8 +22,7 @@
                         </div>
                         <div class="col-sm-3">
                             <div class="form-group">
-                                <select class="form-control-md form-control input-s-sm inline"
-                                        v-model="reportFloorUnitFeeSummaryInfo.conditions.unitId">
+                                <select class="form-control-md form-control input-s-sm inline" v-model="reportFloorUnitFeeSummaryInfo.conditions.unitId">
                                     <option selected value="">请选择单元</option>
                                     <option v-for="(unit,index) in reportFloorUnitFeeSummaryInfo.roomUnits" :key="index"
                                             v-bind:value="unit.unitId">
@@ -55,8 +51,7 @@
                             <button type="button" class="btn btn-primary btn-md" v-on:click="_queryMethod()"><i
                                     class="fa fa-search"></i> 查询
                             </button>
-                            <button type="button" class="btn btn-info btn-md" v-on:click="_resetMethod()"
-                                    style="margin-left: 20px;">
+                            <button type="button" class="btn btn-info btn-md" v-on:click="_resetMethod()" style="margin-left: 20px;">
                                 <i class="fa fa-repeat"></i>重置
                             </button>
                         </div>
@@ -87,6 +82,7 @@
             <div class="ibox">
                 <div class="ibox-title">
                     <h5>楼栋费用表</h5>
+                    <span style="font-size: 10px;">(按天更新)</span>
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_exportExcel()">
                             <i class="fa fa-plus"></i>导出
@@ -96,49 +92,49 @@
                 <div class="ibox-content">
                     <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                         <thead>
-                        <tr>
-                            <th class="text-center">日期</th>
-                            <th class="text-center">楼栋</th>
-                            <th class="text-center">单元</th>
-                            <th class="text-center" v-for="(item,index) in reportFloorUnitFeeSummaryInfo.feeConfigNames">
-                                {{item.configName}}(实收)
-                            </th>
-                            <th class="text-center">历史欠费(单位:元)</th>
-                            <th class="text-center">当月应收(单位:元)</th>
-                            <th class="text-center">应收合计(单位:元)</th>
-                            <th class="text-center">当月实收(单位:元)</th>
-                            <th class="text-center">欠费追回(单位:元)</th>
-                            <th class="text-center">预交费用(单位:元)</th>
-                            <th class="text-center">实收合计(单位:元)</th>
-                            <th class="text-center">欠费金额(单位:元)</th>
-                            <th class="text-center">更新时间</th>
-                        </tr>
+                            <tr>
+                                <th class="text-center">日期</th>
+                                <th class="text-center">楼栋</th>
+                                <th class="text-center">单元</th>
+                                <th class="text-center" v-for="(item,index) in reportFloorUnitFeeSummaryInfo.feeConfigNames">
+                                    {{item.configName}}(实收)
+                                </th>
+                                <th class="text-center">历史欠费(单位:元)</th>
+                                <th class="text-center">当月应收(单位:元)</th>
+                                <th class="text-center">应收合计(单位:元)</th>
+                                <th class="text-center">当月实收(单位:元)</th>
+                                <th class="text-center">欠费追回(单位:元)</th>
+                                <th class="text-center">预交费用(单位:元)</th>
+                                <th class="text-center">实收合计(单位:元)</th>
+                                <th class="text-center">欠费金额(单位:元)</th>
+                                <th class="text-center">更新时间</th>
+                            </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="fee in reportFloorUnitFeeSummaryInfo.fees">
-                            <td class="text-center">{{fee.feeYear+'年'+fee.feeMonth+'月'}}</td>
-                            <td class="text-center">{{fee.floorNum}}号楼</td>
-                            <td class="text-center">{{fee.unitNum}}单元</td>
-                            <td class="text-center" v-for="item in reportFloorUnitFeeSummaryInfo.feeConfigNames">
-                                {{_getFeeReceivedAmountAmount(item,fee)}}
-                            </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>
-                            <td class="text-center">{{fee.curReceivedAmount}}</td>
-                            <td class="text-center">{{fee.hisOweReceivedAmount}}</td>
-                            <td class="text-center">{{fee.preReceivedAmount}}</td>
-                            <td class="text-center">{{_computeSum(_computeSum(fee.hisOweReceivedAmount,fee.preReceivedAmount),fee.curReceivedAmount)}}</td>
-                            <td class="text-center">{{_computeOweFee(fee)}}</td>
-                            <td class="text-center">{{fee.updateTime}}</td>
-                        </tr>
+                            <tr v-for="fee in reportFloorUnitFeeSummaryInfo.fees">
+                                <td class="text-center">{{fee.feeYear+'年'+fee.feeMonth+'月'}}</td>
+                                <td class="text-center">{{fee.floorNum}}号楼</td>
+                                <td class="text-center">{{fee.unitNum}}单元</td>
+                                <td class="text-center" v-for="item in reportFloorUnitFeeSummaryInfo.feeConfigNames">
+                                    {{_getFeeReceivedAmountAmount(item,fee)}}
+                                </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>
+                                <td class="text-center">{{fee.curReceivedAmount}}</td>
+                                <td class="text-center">{{fee.hisOweReceivedAmount}}</td>
+                                <td class="text-center">{{fee.preReceivedAmount}}</td>
+                                <td class="text-center">{{_computeSum(_computeSum(fee.hisOweReceivedAmount,fee.preReceivedAmount),fee.curReceivedAmount)}}</td>
+                                <td class="text-center">{{_computeOweFee(fee)}}</td>
+                                <td class="text-center">{{fee.updateTime}}</td>
+                            </tr>
                         </tbody>
                         <tfoot>
-                        <tr>
-                            <td colspan="7">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
+                            <tr>
+                                <td colspan="7">
+                                    <ul class="pagination float-right"></ul>
+                                </td>
+                            </tr>
                         </tfoot>
                     </table>
                     <!-- 分页 -->
diff --git a/public/pages/property/reportOweFeeDetail/reportOweFeeDetail.html b/public/pages/property/reportOweFeeDetail/reportOweFeeDetail.html
index cc512fb58..4e0ce5223 100755
--- a/public/pages/property/reportOweFeeDetail/reportOweFeeDetail.html
+++ b/public/pages/property/reportOweFeeDetail/reportOweFeeDetail.html
@@ -5,8 +5,7 @@
                 <div class="ibox-title">
                     <h5>查询条件</h5>
                     <div class="ibox-tools" style="top:10px;">
-                        <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
-                                v-on:click="_moreCondition()">{{reportOweFeeDetailInfo.moreCondition == true?'隐藏':'更多'}}
+                        <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;" v-on:click="_moreCondition()">{{reportOweFeeDetailInfo.moreCondition == true?'隐藏':'更多'}}
                         </button>
                     </div>
                 </div>
@@ -14,11 +13,9 @@
                     <div class="row">
                         <div class="col-sm-4">
                             <div class="form-group input-group">
-                                <input type="text" placeholder="请选择楼栋"
-                                       v-model="reportOweFeeDetailInfo.conditions.floorName" class=" form-control">
+                                <input type="text" placeholder="请选择楼栋" v-model="reportOweFeeDetailInfo.conditions.floorName" class=" form-control">
                                 <div class="input-group-prepend">
-                                    <button type="button" class="btn btn-primary btn-sm"
-                                            v-on:click="_openChooseFloorMethod()">
+                                    <button type="button" class="btn btn-primary btn-sm" v-on:click="_openChooseFloorMethod()">
                                         <i class="fa fa-search"></i> 选择
                                     </button>
                                 </div>
@@ -26,8 +23,7 @@
                         </div>
                         <div class="col-sm-3">
                             <div class="form-group">
-                                <select class="form-control-md form-control input-s-sm inline"
-                                        v-model="reportOweFeeDetailInfo.conditions.unitId">
+                                <select class="form-control-md form-control input-s-sm inline" v-model="reportOweFeeDetailInfo.conditions.unitId">
                                     <option selected value="">请选择单元</option>
                                     <option v-for="(unit,index) in reportOweFeeDetailInfo.roomUnits" :key="index"
                                             v-bind:value="unit.unitId">
@@ -38,16 +34,14 @@
                         </div>
                         <div class="col-sm-3">
                             <div class="form-group">
-                                <input type="text" placeholder="请填写房屋编号" class="form-control form-control-md"
-                                       v-model="reportOweFeeDetailInfo.conditions.roomNum">
+                                <input type="text" placeholder="请填写房屋编号" class="form-control form-control-md" v-model="reportOweFeeDetailInfo.conditions.roomNum">
                             </div>
                         </div>
                         <div class="col-sm-2">
                             <button type="button" class="btn btn-primary btn-md" v-on:click="_queryMethod()">
                                 <i class="fa fa-search"></i> 查询
                             </button>
-                            <button type="button" class="btn btn-info btn-md" v-on:click="_resetMethod()"
-                                    style="margin-left: 20px;">
+                            <button type="button" class="btn btn-info btn-md" v-on:click="_resetMethod()" style="margin-left: 20px;">
                                 <i class="fa fa-repeat"></i>重置
                             </button>
                         </div>
@@ -55,16 +49,12 @@
                     <div class="row" v-show="reportOweFeeDetailInfo.moreCondition == true">
                         <div class="col-sm-4">
                             <div class="form-group input-group">
-                                <input type="text" placeholder="请选择创建开始时间"
-                                       v-model="reportOweFeeDetailInfo.conditions.startTime"
-                                       class=" form-control startTime">
+                                <input type="text" placeholder="请选择创建开始时间" v-model="reportOweFeeDetailInfo.conditions.startTime" class=" form-control startTime">
                             </div>
                         </div>
                         <div class="col-sm-3">
                             <div class="form-group input-group">
-                                <input type="text" placeholder="请选择创建结束时间"
-                                       v-model="reportOweFeeDetailInfo.conditions.endTime"
-                                       class=" form-control endTime">
+                                <input type="text" placeholder="请选择创建结束时间" v-model="reportOweFeeDetailInfo.conditions.endTime" class=" form-control endTime">
                             </div>
                         </div>
                     </div>
@@ -77,6 +67,7 @@
             <div class="ibox">
                 <div class="ibox-title">
                     <h5>欠费明细表</h5>
+                    <span style="font-size: 10px;">(按天更新)</span>
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_exportExcel()">
                             <i class="fa fa-plus"></i>导出
@@ -86,41 +77,41 @@
                 <div class="ibox-content">
                     <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                         <thead>
-                        <tr>
-                            <th class="text-center">费用编号</th>
-                            <th class="text-center">房号</th>
-                            <th class="text-center">业主</th>
-                            <th class="text-center">面积</th>
-                            <th class="text-center">费用项</th>
-                            <th class="text-center">费用开始时间</th>
-                            <th class="text-center">更新时间</th>
-                            <th class="text-center">欠费时长（天）</th>
-                            <th class="text-center">欠费金额</th>
-                        </tr>
+                            <tr>
+                                <th class="text-center">费用编号</th>
+                                <th class="text-center">房号</th>
+                                <th class="text-center">业主</th>
+                                <th class="text-center">面积</th>
+                                <th class="text-center">费用项</th>
+                                <th class="text-center">费用开始时间</th>
+                                <th class="text-center">更新时间</th>
+                                <th class="text-center">欠费时长（天）</th>
+                                <th class="text-center">欠费金额</th>
+                            </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="(fee,index) in reportOweFeeDetailInfo.fees">
-                            <td class="text-center">{{index+1}}</td>
-                            <td class="text-center">{{fee.objName}}</td>
-                            <td class="text-center">{{fee.ownerName}}</td>
-                            <td class="text-center">{{fee.builtUpArea}}</td>
-                            <td class="text-center">{{fee.feeName}}</td>
-                            <td class="text-center">{{fee.feeCreateTime}}</td>
-                            <td class="text-center">{{fee.updateTime}}</td>
-                            <td class="text-center">{{fee.oweDay}}</td>
-                            <td class="text-center">{{fee.oweAmount}}</td>
-                        </tr>
+                            <tr v-for="(fee,index) in reportOweFeeDetailInfo.fees">
+                                <td class="text-center">{{index+1}}</td>
+                                <td class="text-center">{{fee.objName}}</td>
+                                <td class="text-center">{{fee.ownerName}}</td>
+                                <td class="text-center">{{fee.builtUpArea}}</td>
+                                <td class="text-center">{{fee.feeName}}</td>
+                                <td class="text-center">{{fee.feeCreateTime}}</td>
+                                <td class="text-center">{{fee.updateTime}}</td>
+                                <td class="text-center">{{fee.oweDay}}</td>
+                                <td class="text-center">{{fee.oweAmount}}</td>
+                            </tr>
                         </tbody>
                         <tfoot>
-                        <tr>
-                            <td colspan="7">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
+                            <tr>
+                                <td colspan="7">
+                                    <ul class="pagination float-right"></ul>
+                                </td>
+                            </tr>
                         </tfoot>
                     </table>
-                     <!-- 分页 -->
-                     <div class="row">
+                    <!-- 分页 -->
+                    <div class="row">
                         <span class="col-md-1 margin-left">
                             <div class="row"><b>小计</b></div>
                             <div class="row"><b>大计</b></div>
diff --git a/public/pages/property/reportPrePaymentFee/reportPrePaymentFee.html b/public/pages/property/reportPrePaymentFee/reportPrePaymentFee.html
index e0036a44b..88948af20 100755
--- a/public/pages/property/reportPrePaymentFee/reportPrePaymentFee.html
+++ b/public/pages/property/reportPrePaymentFee/reportPrePaymentFee.html
@@ -4,6 +4,7 @@
             <div class="ibox">
                 <div class="ibox-title">
                     <h5>预缴费提醒</h5>
+                    <span style="font-size: 10px;">(按天更新)</span>
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_exportExcel()">
                             <i class="fa fa-plus"></i> 导出
@@ -13,29 +14,29 @@
                 <div class="ibox-content">
                     <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                         <thead>
-                        <tr>
-                            <th class="text-center">费用编号</th>
-                            <th class="text-center">房号</th>
-                            <th class="text-center">费用项</th>
-                            <th class="text-center">费用开始时间</th>
-                            <th class="text-center">距离费用开始时间（天）</th>
-                        </tr>
+                            <tr>
+                                <th class="text-center">费用编号</th>
+                                <th class="text-center">房号</th>
+                                <th class="text-center">费用项</th>
+                                <th class="text-center">费用开始时间</th>
+                                <th class="text-center">距离费用开始时间（天）</th>
+                            </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="(fee,index) in reportPrePaymentFeeInfo.fees">
-                            <td class="text-center">{{index+1}}</td>
-                            <td class="text-center">{{fee.objName}}</td>
-                            <td class="text-center">{{fee.feeName}}</td>
-                            <td class="text-center">{{fee.endTime}}</td>
-                            <td class="text-center">{{fee.oweDay}}</td>
-                        </tr>
+                            <tr v-for="(fee,index) in reportPrePaymentFeeInfo.fees">
+                                <td class="text-center">{{index+1}}</td>
+                                <td class="text-center">{{fee.objName}}</td>
+                                <td class="text-center">{{fee.feeName}}</td>
+                                <td class="text-center">{{fee.endTime}}</td>
+                                <td class="text-center">{{fee.oweDay}}</td>
+                            </tr>
                         </tbody>
                         <tfoot>
-                        <tr>
-                            <td colspan="7">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
+                            <tr>
+                                <td colspan="7">
+                                    <ul class="pagination float-right"></ul>
+                                </td>
+                            </tr>
                         </tfoot>
                     </table>
                     <!-- 分页 -->
diff --git a/public/pages/property/roomCreateFee/roomCreateFee.js b/public/pages/property/roomCreateFee/roomCreateFee.js
index a99ab6ce6..4e1dc62f5 100755
--- a/public/pages/property/roomCreateFee/roomCreateFee.js
+++ b/public/pages/property/roomCreateFee/roomCreateFee.js
@@ -91,8 +91,7 @@
                 //房屋编号去空
                 param.params.roomNum = param.params.roomNum.trim();
                 //发送get请求
-                vc.http.get('roomCreateFee',
-                    'listRoom',
+                vc.http.apiGet('/fee.listRoomsWhereFeeSet',
                     param,
                     function(json, res) {
                         var listRoomData = JSON.parse(json);