From 14a03800883dcb3bce54d2ea749dbebcdcfed288 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 8 Sep 2023 12:10:58 +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

---
 .../payFeeDiscount/payFeeDiscount.html        | 10 +++----
 .../property/payFeeDiscount/payFeeDiscount.js | 28 +++++++++++++------
 .../property/payFeeOrder/payFeeOrder.html     |  5 +---
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/public/components/property/payFeeDiscount/payFeeDiscount.html b/public/components/property/payFeeDiscount/payFeeDiscount.html
index 18f4a5df0..478940aaf 100644
--- a/public/components/property/payFeeDiscount/payFeeDiscount.html
+++ b/public/components/property/payFeeDiscount/payFeeDiscount.html
@@ -8,7 +8,7 @@
             <div class="ibox">
                 <div class="ibox-title">
                     <h5>
-                        <span><vc:i18n name="折扣信息" namespace="payFeeDiscount"></vc:i18n></span>
+                        <vc:i18n name="折扣信息" namespace="payFeeDiscount"></vc:i18n>
                     </h5>
                     <div class="ibox-tools" style="top:10px;">
                         <!-- <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddFeeDiscountModal()">
@@ -26,16 +26,16 @@
                                        @click="checkAllDiscount($event)">
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="折扣类型" namespace="payFeeDiscount"></vc:i18n></span>
+                                <vc:i18n name="折扣类型" namespace="payFeeDiscount"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="折扣名称" namespace="payFeeDiscount"></vc:i18n></span>
+                                <vc:i18n name="折扣名称" namespace="payFeeDiscount"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="规则名称" namespace="payFeeDiscount"></vc:i18n></span>
+                                <vc:i18n name="规则名称" namespace="payFeeDiscount"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="规则" namespace="payFeeDiscount"></vc:i18n></span>
+                                <vc:i18n name="规则" namespace="payFeeDiscount"></vc:i18n>
                             </th>
                             <th class="text-center">
                                 <span><vc:i18n name="折扣金额" namespace="payFeeDiscount"></vc:i18n></span>
diff --git a/public/components/property/payFeeDiscount/payFeeDiscount.js b/public/components/property/payFeeDiscount/payFeeDiscount.js
index 19b7ed445..f8e23b1d3 100644
--- a/public/components/property/payFeeDiscount/payFeeDiscount.js
+++ b/public/components/property/payFeeDiscount/payFeeDiscount.js
@@ -42,7 +42,7 @@
                 if ($that.payFeeDiscountInfo.cycles < 0) {
                     return;
                 }
-                vc.component._listFeeDiscounts(DEFAULT_PAGE, DEFAULT_ROWS);
+                $that._listFeeDiscounts(DEFAULT_PAGE, DEFAULT_ROWS);
             });
         },
         methods: {
@@ -135,11 +135,11 @@
                     for (var i = 0; i < checkObj.length; i++) {
                         if (!checkObj[i].checked) { // 将未勾选的checkbox选项push到绑定数组中
                             let _value = checkObj[i].value;
-                            vc.component.payFeeDiscountInfo.selectDiscountIds.push(_value);
+                            $that.payFeeDiscountInfo.selectDiscountIds.push(_value);
                         }
                     }
                 } else { // 如果是去掉全选则清空checkbox选项绑定数组
-                    vc.component.payFeeDiscountInfo.selectDiscountIds = [];
+                    $that.payFeeDiscountInfo.selectDiscountIds = [];
                 }
             },
             _computeFeeDiscount: function () {
@@ -147,8 +147,8 @@
                 let _selectDiscount = [];
                 $that.payFeeDiscountInfo.selectDiscountIds.forEach(item => {
                     $that.payFeeDiscountInfo.feeDiscounts.forEach(disItem => {
-                        if (disItem.feeDiscountSpecs != null && disItem.feeDiscountSpecs != undefined && disItem.feeDiscountSpecs.length > 0) {
-                            var specValue = "";
+                        if (disItem.feeDiscountSpecs && disItem.feeDiscountSpecs.length > 0) {
+                            let specValue = "";
                             disItem.feeDiscountSpecs.forEach(feeItem => {
                                 if (feeItem.specName == "月份") {
                                     specValue = feeItem.specValue;
@@ -159,14 +159,26 @@
                             }
                         }
                         if (item == disItem.discountId && disItem.discountPrice != 0 && disItem.ruleId != "102020008") {
-                            if (disItem.feeDiscountSpecs != null && disItem.feeDiscountSpecs != undefined && disItem.feeDiscountSpecs.length > 0) {
-                                var specValue = "";
+                            if (disItem.feeDiscountSpecs && disItem.feeDiscountSpecs.length > 0) {
+                                let specValue = "";
                                 disItem.feeDiscountSpecs.forEach(feeItem => {
                                     if (feeItem.specName == "月份") {
                                         specValue = feeItem.specValue;
                                     }
                                 })
-                                if (specValue != "" && parseFloat($that.payFeeDiscountInfo.cycles) >= parseFloat(specValue)) {
+                                if (specValue&& parseFloat($that.payFeeDiscountInfo.cycles) >= parseFloat(specValue)) {
+                                    _totalDiscountMoney += parseFloat(disItem.discountPrice);
+                                    _selectDiscount.push(disItem);
+                                }
+
+                                //todo 考虑滞纳金
+                                specValue = "";
+                                disItem.feeDiscountSpecs.forEach(feeItem => {
+                                    if (feeItem.specName == "滞纳金") {
+                                        specValue = feeItem.specValue;
+                                    }
+                                })
+                                if (specValue) {
                                     _totalDiscountMoney += parseFloat(disItem.discountPrice);
                                     _selectDiscount.push(disItem);
                                 }
diff --git a/public/pages/property/payFeeOrder/payFeeOrder.html b/public/pages/property/payFeeOrder/payFeeOrder.html
index 613b5dda4..6f51e603c 100644
--- a/public/pages/property/payFeeOrder/payFeeOrder.html
+++ b/public/pages/property/payFeeOrder/payFeeOrder.html
@@ -13,10 +13,7 @@
                     </h5>
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                                v-on:click="vc.goBack()">
-                            <span>
-                                <span><vc:i18n name="返回" namespace="payFeeOrder"></vc:i18n></span>
-                            </span>
+                                v-on:click="vc.goBack()"><vc:i18n name="返回" namespace="payFeeOrder"></vc:i18n>
                         </button>
                     </div>
                 </div>