From 0fa332f75fab543ed3795d2367e427024f21b032 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: Tue, 5 Jan 2021 08:16:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E6=98=8E=E7=BB=86=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E4=BC=98=E6=83=A0=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E3=80=81=E5=87=8F=E5=85=8D=E9=87=91=E9=A2=9D=E3=80=81=E6=BB=9E?=
 =?UTF-8?q?=E7=BA=B3=E9=87=91=E3=80=81=E7=A9=BA=E7=BD=AE=E6=88=BF=E6=89=93?=
 =?UTF-8?q?=E6=8A=98=E9=87=91=E9=A2=9D=E3=80=81=E7=A9=BA=E7=BD=AE=E6=88=BF?=
 =?UTF-8?q?=E5=87=8F=E5=85=8D=E9=87=91=E9=A2=9D=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=94=B6=E8=B4=B9=E9=A1=B9=E4=B8=8B=E6=8B=89=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feeDiscountManage/feeDiscountManage.html  |   2 +-
 .../reportPayFeeDetail.html                   |  53 ++++--
 .../reportPayFeeDetail/reportPayFeeDetail.js  | 164 ++++++++++++++++--
 3 files changed, 189 insertions(+), 30 deletions(-)

diff --git a/public/pages/property/feeDiscountManage/feeDiscountManage.html b/public/pages/property/feeDiscountManage/feeDiscountManage.html
index 05b0cf3a8..1527cec6a 100644
--- a/public/pages/property/feeDiscountManage/feeDiscountManage.html
+++ b/public/pages/property/feeDiscountManage/feeDiscountManage.html
@@ -67,7 +67,7 @@
                         <tr v-for="feeDiscount in feeDiscountManageInfo.feeDiscounts">
                             <td class="text-center">{{feeDiscount.discountId}}</td>
                             <td class="text-center">{{feeDiscount.discountName}}</td>
-                            <td class="text-center">{{feeDiscount.discountType == '1001'?'优惠':'违约'}}</td>
+                            <td class="text-center">{{feeDiscount.discountType == '1001'?'优惠':(feeDiscount.discountType == '2002'?'违约':'优惠(需要申请)')}}</td>
                             <td class="text-center">{{feeDiscount.ruleName}}</td>
                             <td class="text-center">
                                 <div v-for="(item,index) in feeDiscount.feeDiscountSpecs">
diff --git a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html
index 26d642b8e..44da5dac9 100644
--- a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html
+++ b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html
@@ -119,8 +119,13 @@
                             <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>
@@ -130,11 +135,17 @@
                             <td class="text-center">{{fee.feeName}}</td>
                             <td class="text-center">{{fee.primeRate}}</td>
                             <td class="text-center">{{vc.dateFormat(fee.startTime)}}</td>
-                            <td class="text-center" v-if="fee.startTime >= fee.endTime">{{vc.dateFormat(fee.endTime)}}</td>
-                            <td class="text-center" v-else>{{vc.dateSub(vc.dateFormat(fee.endTime),fee.feeFlag)}}</td> 
+                            <td class="text-center" v-if="fee.startTime >= fee.endTime">{{vc.dateFormat(fee.endTime)}}
+                            </td>
+                            <td class="text-center" v-else>{{vc.dateSub(vc.dateFormat(fee.endTime),fee.feeFlag)}}</td>
                             <td class="text-center">{{fee.createTime}}</td>
                             <td class="text-center">{{fee.receivableAmount}}</td>
                             <td class="text-center">{{fee.receivedAmount}}</td>
+                            <td class="text-center">{{fee.preferentialAmount}}</td>
+                            <td class="text-center">{{fee.deductionAmount}}</td>
+                            <td class="text-center">{{fee.lateFee}}</td>
+                            <td class="text-center">{{fee.vacantHousingDiscount}}</td>
+                            <td class="text-center">{{fee.vacantHousingReduction}}</td>
                         </tr>
                         </tbody>
                         <tfoot>
@@ -147,18 +158,34 @@
                     </table>
                     <!-- 分页 -->
                     <div class="row">
-                        <div class="col-md-4">
-                            <span class="margin-left">小计应收: {{reportPayFeeDetailInfo.totalReceivableAmount}}元</span>
-                            <span class="margin-left">小计实收: {{reportPayFeeDetailInfo.totalReceivedAmount}}元</span>
-                        </div>
-                        <div class="col-md-8 text-center">
-                            <vc:create path="frame/pagination"></vc:create>
+                        <div class="col-md-12">
+                            <span class="margin-left"><span class="col-md-1"><b>小计</b></span>
+                                <span class="col-md-1 margin-left"> 应收: {{reportPayFeeDetailInfo.totalReceivableAmount}}元</span>
+                                <span class="col-md-1 margin-left">实收: {{reportPayFeeDetailInfo.totalReceivedAmount}}元</span>
+                                <span class="col-md-1 margin-left">优惠: {{reportPayFeeDetailInfo.totalPreferentialAmount}}元</span>
+                                <span class="col-md-1 margin-left">减免: {{reportPayFeeDetailInfo.totalDeductionAmount}}元</span>
+                                <span class="col-md-1 margin-left">滞纳金: {{reportPayFeeDetailInfo.totalLateFee}}元</span>
+                                <span class="col-md-1 margin-left">空置房打折: {{reportPayFeeDetailInfo.totalVacantHousingDiscount}}元</span>
+                                <span class="col-md-1 margin-left">空置房减免: {{reportPayFeeDetailInfo.allVacantHousingReduction}}元</span>
+                            </span>
                         </div>
                     </div>
                     <div class="row">
-                        <div class="col-md-4">
-                            <span class="margin-left">大计应收: {{reportPayFeeDetailInfo.allReceivableAmount}}元</span>
-                            <span class="margin-left">大计实收: {{reportPayFeeDetailInfo.allReceivedAmount}}元</span>
+                        <div class="col-md-12">
+                            <span class="margin-left"><span class="col-md-1"><b>大计</b></span>
+                                <span class="col-md-1 margin-left"> 应收: {{reportPayFeeDetailInfo.allReceivableAmount}}元</span>
+                                <span class="col-md-1 margin-left">实收: {{reportPayFeeDetailInfo.allReceivedAmount}}元</span>
+                                <span class="col-md-1 margin-left">优惠: {{reportPayFeeDetailInfo.allPreferentialAmount}}元</span>
+                                <span class="col-md-1 margin-left">减免: {{reportPayFeeDetailInfo.allDeductionAmount}}元</span>
+                                <span class="col-md-1 margin-left">滞纳金: {{reportPayFeeDetailInfo.allLateFee}}元</span>
+                                <span class="col-md-1 margin-left">空置房打折: {{reportPayFeeDetailInfo.allVacantHousingDiscount}}元</span>
+                                <span class="col-md-1 margin-left">空置房减免: {{reportPayFeeDetailInfo.allVacantHousingReduction}}元</span>
+                            </span>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-md-12 text-center">
+                            <vc:create path="frame/pagination"></vc:create>
                         </div>
                     </div>
                 </div>
diff --git a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js
index 74ea0401a..f8493bddd 100644
--- a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js
+++ b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js
@@ -19,6 +19,16 @@
                 totalReceivedAmount: 0.0,
                 allReceivableAmount: 0.0,
                 allReceivedAmount: 0.0,
+                totalPreferentialAmount: 0.0,
+                totalDeductionAmount: 0.0,
+                totalLateFee: 0.0,
+                totalVacantHousingDiscount: 0.0,
+                totalVacantHousingReduction: 0.0,
+                allPreferentialAmount: 0.0,
+                allDeductionAmount: 0.0,
+                allLateFee: 0.0,
+                allVacantHousingDiscount: 0.0,
+                allVacantHousingReduction: 0.0,
                 conditions: {
                     floorId: '',
                     floorName: '',
@@ -133,18 +143,79 @@
                         vc.component.reportPayFeeDetailInfo.total = _reportPayFeeDetailInfo.total;
                         vc.component.reportPayFeeDetailInfo.records = _reportPayFeeDetailInfo.records;
                         vc.component.reportPayFeeDetailInfo.fees = _reportPayFeeDetailInfo.data;
-                        if (_reportPayFeeDetailInfo.data.length > 0) {
-                            vc.component.reportPayFeeDetailInfo.totalReceivableAmount = _reportPayFeeDetailInfo.data[0].totalReceivableAmount;
-                            vc.component.reportPayFeeDetailInfo.totalReceivedAmount = _reportPayFeeDetailInfo.data[0].totalReceivedAmount;
-                            vc.component.reportPayFeeDetailInfo.allReceivableAmount = _reportPayFeeDetailInfo.data[0].allReceivableAmount;
-                            vc.component.reportPayFeeDetailInfo.allReceivedAmount = _reportPayFeeDetailInfo.data[0].allReceivedAmount;
-                            vc.component.reportPayFeeDetailInfo.feeConfigDtos = _reportPayFeeDetailInfo.data[0].feeConfigDtos;
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.totalReceivableAmount) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.totalReceivableAmount = _reportPayFeeDetailInfo.sumTotal.totalReceivableAmount;
                         } else {
                             vc.component.reportPayFeeDetailInfo.totalReceivableAmount = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.totalReceivedAmount) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.totalReceivedAmount = _reportPayFeeDetailInfo.sumTotal.totalReceivedAmount;
+                        } else {
                             vc.component.reportPayFeeDetailInfo.totalReceivedAmount = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.allReceivableAmount) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.allReceivableAmount = _reportPayFeeDetailInfo.sumTotal.allReceivableAmount;
+                        } else {
                             vc.component.reportPayFeeDetailInfo.allReceivableAmount = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.allReceivedAmount) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.allReceivedAmount = _reportPayFeeDetailInfo.sumTotal.allReceivedAmount;
+                        } else {
                             vc.component.reportPayFeeDetailInfo.allReceivedAmount = "0.0";
                         }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.totalPreferentialAmount) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.totalPreferentialAmount = _reportPayFeeDetailInfo.sumTotal.totalPreferentialAmount;
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.totalPreferentialAmount = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.totalDeductionAmount) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.totalDeductionAmount = _reportPayFeeDetailInfo.sumTotal.totalDeductionAmount;
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.totalDeductionAmount = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.totalLateFee) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.totalLateFee = (_reportPayFeeDetailInfo.sumTotal.totalLateFee)*(-1);
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.totalLateFee = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.totalVacantHousingDiscount) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.totalVacantHousingDiscount = _reportPayFeeDetailInfo.sumTotal.totalVacantHousingDiscount;
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.totalVacantHousingDiscount = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.totalVacantHousingReduction) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.totalVacantHousingReduction = _reportPayFeeDetailInfo.sumTotal.totalVacantHousingReduction;
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.totalVacantHousingReduction = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.allPreferentialAmount) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.allPreferentialAmount = _reportPayFeeDetailInfo.sumTotal.allPreferentialAmount;
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.allPreferentialAmount = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.allDeductionAmount) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.allDeductionAmount = _reportPayFeeDetailInfo.sumTotal.allDeductionAmount;
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.allDeductionAmount = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.allLateFee) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.allLateFee = (_reportPayFeeDetailInfo.sumTotal.allLateFee)*(-1);
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.allLateFee = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.allVacantHousingDiscount) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.allVacantHousingDiscount = _reportPayFeeDetailInfo.sumTotal.allVacantHousingDiscount;
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.allVacantHousingDiscount = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.allVacantHousingReduction) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.allVacantHousingReduction = _reportPayFeeDetailInfo.sumTotal.allVacantHousingReduction;
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.allVacantHousingReduction = "0.0";
+                        }
+                        if (_reportPayFeeDetailInfo.data.length > 0) {
+                            vc.component.reportPayFeeDetailInfo.feeConfigDtos = _reportPayFeeDetailInfo.data[0].feeConfigDtos;
+                        }
                         vc.emit('pagination', 'init', {
                             total: vc.component.reportPayFeeDetailInfo.records,
                             currentPage: _page,
@@ -179,17 +250,78 @@
                         vc.component.reportPayFeeDetailInfo.total = _reportPayFeeDetailInfo.total;
                         vc.component.reportPayFeeDetailInfo.records = _reportPayFeeDetailInfo.records;
                         vc.component.reportPayFeeDetailInfo.fees = _reportPayFeeDetailInfo.data;
-                        if (_reportPayFeeDetailInfo.data.length > 0) {
-                            vc.component.reportPayFeeDetailInfo.totalReceivableAmount = _reportPayFeeDetailInfo.data[0].totalReceivableAmount;
-                            vc.component.reportPayFeeDetailInfo.totalReceivedAmount = _reportPayFeeDetailInfo.data[0].totalReceivedAmount;
-                            vc.component.reportPayFeeDetailInfo.allReceivableAmount = _reportPayFeeDetailInfo.data[0].allReceivableAmount;
-                            vc.component.reportPayFeeDetailInfo.allReceivedAmount = _reportPayFeeDetailInfo.data[0].allReceivedAmount;
-                            vc.component.reportPayFeeDetailInfo.feeConfigDtos = _reportPayFeeDetailInfo.data[0].feeConfigDtos;
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.totalReceivableAmount) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.totalReceivableAmount = _reportPayFeeDetailInfo.sumTotal.totalReceivableAmount;
                         } else {
-                            vc.component.reportPayFeeDetailInfo.totalReceivableAmount = 0.0;
-                            vc.component.reportPayFeeDetailInfo.totalReceivedAmount = 0.0;
-                            vc.component.reportPayFeeDetailInfo.allReceivableAmount = 0.0;
-                            vc.component.reportPayFeeDetailInfo.allReceivedAmount = 0.0;
+                            vc.component.reportPayFeeDetailInfo.totalReceivableAmount = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.totalReceivedAmount) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.totalReceivedAmount = _reportPayFeeDetailInfo.sumTotal.totalReceivedAmount;
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.totalReceivedAmount = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.allReceivableAmount) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.allReceivableAmount = _reportPayFeeDetailInfo.sumTotal.allReceivableAmount;
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.allReceivableAmount = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.allReceivedAmount) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.allReceivedAmount = _reportPayFeeDetailInfo.sumTotal.allReceivedAmount;
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.allReceivedAmount = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.totalPreferentialAmount) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.totalPreferentialAmount = _reportPayFeeDetailInfo.sumTotal.totalPreferentialAmount;
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.totalPreferentialAmount = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.totalDeductionAmount) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.totalDeductionAmount = _reportPayFeeDetailInfo.sumTotal.totalDeductionAmount;
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.totalDeductionAmount = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.totalLateFee) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.totalLateFee = (_reportPayFeeDetailInfo.sumTotal.totalLateFee)*(-1);
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.totalLateFee = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.totalVacantHousingDiscount) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.totalVacantHousingDiscount = _reportPayFeeDetailInfo.sumTotal.totalVacantHousingDiscount;
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.totalVacantHousingDiscount = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.totalVacantHousingReduction) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.totalVacantHousingReduction = _reportPayFeeDetailInfo.sumTotal.totalVacantHousingReduction;
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.totalVacantHousingReduction = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.allPreferentialAmount) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.allPreferentialAmount = _reportPayFeeDetailInfo.sumTotal.allPreferentialAmount;
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.allPreferentialAmount = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.allDeductionAmount) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.allDeductionAmount = _reportPayFeeDetailInfo.sumTotal.allDeductionAmount;
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.allDeductionAmount = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.allLateFee) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.allLateFee = (_reportPayFeeDetailInfo.sumTotal.allLateFee)*(-1);
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.allLateFee = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.allVacantHousingDiscount) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.allVacantHousingDiscount = _reportPayFeeDetailInfo.sumTotal.allVacantHousingDiscount;
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.allVacantHousingDiscount = "0.0";
+                        }
+                        if (typeof(_reportPayFeeDetailInfo.sumTotal.allVacantHousingReduction) != 'undefined') {
+                            vc.component.reportPayFeeDetailInfo.allVacantHousingReduction = _reportPayFeeDetailInfo.sumTotal.allVacantHousingReduction;
+                        } else {
+                            vc.component.reportPayFeeDetailInfo.allVacantHousingReduction = "0.0";
+                        }
+                        if (_reportPayFeeDetailInfo.data.length > 0) {
+                            vc.component.reportPayFeeDetailInfo.feeConfigDtos = _reportPayFeeDetailInfo.data[0].feeConfigDtos;
                         }
                         vc.emit('pagination', 'init', {
                             total: vc.component.reportPayFeeDetailInfo.records,