From 76396de58dfea84717978d2dd40d1992f3375162 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Tue, 30 Aug 2022 19:52:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=A0=E5=85=A5=E5=BC=80?=
 =?UTF-8?q?=E5=A7=8B=E6=97=B6=E9=97=B4=E5=92=8C=E7=BB=93=E6=9D=9F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reportFeeSummary/reportFeeSummary.html    | 197 +++++++++---------
 1 file changed, 93 insertions(+), 104 deletions(-)

diff --git a/public/pages/property/reportFeeSummary/reportFeeSummary.html b/public/pages/property/reportFeeSummary/reportFeeSummary.html
index afc3dfa1e..3e0486faf 100755
--- a/public/pages/property/reportFeeSummary/reportFeeSummary.html
+++ b/public/pages/property/reportFeeSummary/reportFeeSummary.html
@@ -7,8 +7,7 @@
                         <span><vc:i18n name="查询条件" namespace="reportFeeSummary"></vc:i18n></span>
                     </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()">
+                        <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;" v-on:click="_moreCondition()">
                             <span><vc:i18n name="更多" namespace="reportFeeSummary"></vc:i18n></span>
                         </button>
                     </div>
@@ -17,11 +16,9 @@
                     <div class="row">
                         <div class="col-sm-4">
                             <div class="form-group input-group">
-                                <input type="text" :placeholder="vc.i18n('请选择楼栋','reportFeeSummary')"
-                                       v-model="reportFeeSummaryInfo.conditions.floorName" class=" form-control">
+                                <input type="text" :placeholder="vc.i18n('请选择楼栋','reportFeeSummary')" v-model="reportFeeSummaryInfo.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>
                                         <span><vc:i18n name="选择" namespace="reportFeeSummary"></vc:i18n></span>
                                     </button>
@@ -30,8 +27,7 @@
                         </div>
                         <div class="col-sm-3">
                             <div class="form-group">
-                                <select class="form-control-md form-control input-s-sm inline"
-                                        v-model="reportFeeSummaryInfo.conditions.unitId">
+                                <select class="form-control-md form-control input-s-sm inline" v-model="reportFeeSummaryInfo.conditions.unitId">
                                     <option selected value="">{{vc.i18n('请选择单元','reportFeeSummary')}}</option>
                                     <option v-for="(unit,index) in reportFeeSummaryInfo.roomUnits" :key="index"
                                             v-bind:value="unit.unitId">
@@ -42,9 +38,7 @@
                         </div>
                         <div class="col-sm-3">
                             <div class="form-group">
-                                <input type="text" :placeholder="vc.i18n('请填写房屋编号','reportFeeSummary')"
-                                       class="form-control form-control-md"
-                                       v-model="reportFeeSummaryInfo.conditions.roomNum">
+                                <input type="text" :placeholder="vc.i18n('请填写房屋编号','reportFeeSummary')" class="form-control form-control-md" v-model="reportFeeSummaryInfo.conditions.roomNum">
                             </div>
                         </div>
                         <div class="col-sm-2">
@@ -52,8 +46,7 @@
                                 <i class="fa fa-search"></i>
                                 <span><vc:i18n name="查询" namespace="reportFeeSummary"></vc:i18n></span>
                             </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>
                                 <span><vc:i18n name="重置" namespace="reportFeeSummary"></vc:i18n></span>
                             </button>
@@ -62,21 +55,17 @@
                     <div class="row" v-show="reportFeeSummaryInfo.moreCondition == true">
                         <div class="col-sm-4">
                             <div class="form-group input-group">
-                                <input type="text" :placeholder="vc.i18n('请选择缴费开始时间','reportFeeSummary')"
-                                       v-model="reportFeeSummaryInfo.conditions.startTime"
-                                       class=" form-control startTime">
+                                <input type="text" :placeholder="vc.i18n('请选择缴费开始时间','reportFeeSummary')" v-model="reportFeeSummaryInfo.conditions.startTime" class=" form-control startTime">
                             </div>
                         </div>
                         <div class="col-sm-3">
                             <div class="form-group input-group">
-                                <input type="text" :placeholder="vc.i18n('请选择缴费结束时间','reportFeeSummary')"
-                                       v-model="reportFeeSummaryInfo.conditions.endTime" class=" form-control endTime">
+                                <input type="text" :placeholder="vc.i18n('请选择缴费结束时间','reportFeeSummary')" v-model="reportFeeSummaryInfo.conditions.endTime" class=" form-control endTime">
                             </div>
                         </div>
                         <div class="col-sm-3">
                             <div class="form-group">
-                                <select class="selectpicker" id="configIds"
-                                        :placeholder="vc.i18n('请选择收费项','reportFeeSummary')" multiple>
+                                <select class="selectpicker" id="configIds" :placeholder="vc.i18n('请选择收费项','reportFeeSummary')" multiple>
                                     <option v-for="(item,index) in reportFeeSummaryInfo.feeConfigs" :key="index"
                                             :value="item.configId">{{item.feeName}}
                                     </option>
@@ -108,82 +97,82 @@
                 <div class="ibox-content">
                     <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                         <thead>
-                        <tr>
-                            <th class="text-center">
-                                <span><vc:i18n name="日期" namespace="reportFeeSummary"></vc:i18n></span>
-                            </th>
-                            <th class="text-center" v-for="(item,index) in reportFeeSummaryInfo.feeConfigNames">
-                                {{item.configName}}(实收)
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="历史欠费" namespace="reportFeeSummary"></vc:i18n></span>(单位:元)
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="当月应收" namespace="reportFeeSummary"></vc:i18n></span>(单位:元)
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="应收合计" namespace="reportFeeSummary"></vc:i18n></span>(单位:元)
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="当月实收" namespace="reportFeeSummary"></vc:i18n></span>(单位:元)
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="欠费追回" namespace="reportFeeSummary"></vc:i18n></span>(单位:元)
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="预交费用" namespace="reportFeeSummary"></vc:i18n></span>(单位:元)
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="实收合计" namespace="reportFeeSummary"></vc:i18n></span>(单位:元)
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="欠费金额" namespace="reportFeeSummary"></vc:i18n></span>(单位:元)
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="收费率" namespace="reportFeeSummary"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="更新时间" namespace="reportFeeSummary"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="操作" namespace="reportFeeSummary"></vc:i18n></span>
-                            </th>
-                        </tr>
+                            <tr>
+                                <th class="text-center">
+                                    <span><vc:i18n name="日期" namespace="reportFeeSummary"></vc:i18n></span>
+                                </th>
+                                <th class="text-center" v-for="(item,index) in reportFeeSummaryInfo.feeConfigNames">
+                                    {{item.configName}}(实收)
+                                </th>
+                                <th class="text-center">
+                                    <span><vc:i18n name="历史欠费" namespace="reportFeeSummary"></vc:i18n></span>(单位:元)
+                                </th>
+                                <th class="text-center">
+                                    <span><vc:i18n name="当月应收" namespace="reportFeeSummary"></vc:i18n></span>(单位:元)
+                                </th>
+                                <th class="text-center">
+                                    <span><vc:i18n name="应收合计" namespace="reportFeeSummary"></vc:i18n></span>(单位:元)
+                                </th>
+                                <th class="text-center">
+                                    <span><vc:i18n name="当月实收" namespace="reportFeeSummary"></vc:i18n></span>(单位:元)
+                                </th>
+                                <th class="text-center">
+                                    <span><vc:i18n name="欠费追回" namespace="reportFeeSummary"></vc:i18n></span>(单位:元)
+                                </th>
+                                <th class="text-center">
+                                    <span><vc:i18n name="预交费用" namespace="reportFeeSummary"></vc:i18n></span>(单位:元)
+                                </th>
+                                <th class="text-center">
+                                    <span><vc:i18n name="实收合计" namespace="reportFeeSummary"></vc:i18n></span>(单位:元)
+                                </th>
+                                <th class="text-center">
+                                    <span><vc:i18n name="欠费金额" namespace="reportFeeSummary"></vc:i18n></span>(单位:元)
+                                </th>
+                                <th class="text-center">
+                                    <span><vc:i18n name="收费率" namespace="reportFeeSummary"></vc:i18n></span>
+                                </th>
+                                <th class="text-center">
+                                    <span><vc:i18n name="更新时间" namespace="reportFeeSummary"></vc:i18n></span>
+                                </th>
+                                <th class="text-center">
+                                    <span><vc:i18n name="操作" namespace="reportFeeSummary"></vc:i18n></span>
+                                </th>
+                            </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="fee in reportFeeSummaryInfo.fees">
-                            <td class="text-center">{{fee.feeYear+'年'+fee.feeMonth+'月'}}</td>
-                            <td class="text-center" v-for="item in reportFeeSummaryInfo.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.chargeRate}}</td>
-                            <td class="text-center">{{fee.updateTime}}</td>
-                            <td class="text-center">
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" @click="_toDetail(fee)"><span>
+                            <tr v-for="fee in reportFeeSummaryInfo.fees">
+                                <td class="text-center">{{fee.feeYear+'年'+fee.feeMonth+'月'}}</td>
+                                <td class="text-center" v-for="item in reportFeeSummaryInfo.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.chargeRate}}</td>
+                                <td class="text-center">{{fee.updateTime}}</td>
+                                <td class="text-center">
+                                    <div class="btn-group">
+                                        <button class="btn-white btn btn-xs" @click="_toDetail(fee)"><span>
                                                 <vc:i18n name="明细" namespace="reportFeeSummary"></vc:i18n>
                                             </span>
                                     </button>
-                                </div>
-                            </td>
-                        </tr>
+                                    </div>
+                                </td>
+                            </tr>
                         </tbody>
                         <tfoot>
-                        <tr>
-                            <td colspan="11">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
+                            <tr>
+                                <td colspan="11">
+                                    <ul class="pagination float-right"></ul>
+                                </td>
+                            </tr>
                         </tfoot>
                     </table>
                     <!-- 分页 -->
@@ -192,26 +181,26 @@
                         <span class="col-md-1 margin-left">
                             <div class="row">
                                 <b><span><vc:i18n name="小计" namespace="reportFeeSummary"></vc:i18n></span></b>
-                            </div>
-                            <div class="row">
-                                <b><span><vc:i18n name="大计" namespace="reportFeeSummary"></vc:i18n></span></b>
-                            </div>
-                        </span>
-                        <!--<span class="col-md-2">
+                    </div>
+                    <div class="row">
+                        <b><span><vc:i18n name="大计" namespace="reportFeeSummary"></vc:i18n></span></b>
+                    </div>
+                    </span>
+                    <!--<span class="col-md-2">
                             <div class="row"><span><vc:i18n name="应收" namespace="reportFeeSummary"></vc:i18n></span>: {{reportFeeSummaryInfo.totalReceivableAmount}}<span><vc:i18n name="元" namespace="reportFeeSummary"></vc:i18n></span></div>
                             <div class="row"><span><vc:i18n name="应收" namespace="reportFeeSummary"></vc:i18n></span>: {{reportFeeSummaryInfo.totalReceivableAmount}}<span><vc:i18n name="元" namespace="reportFeeSummary"></vc:i18n></span></div>
                         </span>-->
-                        <span class="col-md-2">
+                    <span class="col-md-2">
                             <div class="row">
                                 <span><vc:i18n name="实收" namespace="reportFeeSummary"></vc:i18n></span>: {{reportFeeSummaryInfo.totalReceivedAmount}}
-                                <span><vc:i18n name="元" namespace="reportFeeSummary"></vc:i18n></span>
-                            </div>
-                            <div class="row">
-                                <span><vc:i18n name="实收" namespace="reportFeeSummary"></vc:i18n></span>: {{reportFeeSummaryInfo.allReceivedAmount}}
-                                <span><vc:i18n name="元" namespace="reportFeeSummary"></vc:i18n></span>
-                            </div>
-                        </span>
-                        <span class="col-md-2">
+                    <span><vc:i18n name="元" namespace="reportFeeSummary"></vc:i18n></span>
+                </div>
+                <div class="row">
+                    <span><vc:i18n name="实收" namespace="reportFeeSummary"></vc:i18n></span>: {{reportFeeSummaryInfo.allReceivedAmount}}
+                    <span><vc:i18n name="元" namespace="reportFeeSummary"></vc:i18n></span>
+                </div>
+                </span>
+                <span class="col-md-2">
                             <div class="row">
                                 <span><vc:i18n name="欠费追回" namespace="reportFeeSummary"></vc:i18n></span>: {{_computeTotalHisOweReceivedAmount()}}
                 <span><vc:i18n name="元" namespace="reportFeeSummary"></vc:i18n></span>