From 75e691492b303f28d0a16f2d4049a350941b2cca Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Wed, 13 Apr 2022 12:55:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=98=E6=89=A3=E9=A1=B5=E9=9D=A2=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payFeeConfigDiscountManage.html           | 85 ++++++++++---------
 1 file changed, 46 insertions(+), 39 deletions(-)

diff --git a/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.html b/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.html
index a6647993b..e14fe3330 100755
--- a/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.html
+++ b/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.html
@@ -8,8 +8,7 @@
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_goBack()">
                             返回
                         </button>
-                        <button type="button" class="btn btn-primary btn-sm"
-                                v-on:click="_openAddPayFeeConfigDiscountModal()">
+                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddPayFeeConfigDiscountModal()">
                             <i class="fa fa-plus"></i>添加
                         </button>
                     </div>
@@ -17,51 +16,59 @@
                 <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>
-                            <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>
+                                <th class="text-center">缴费结束时间</th>
+                                <th class="text-center">折扣终止时间</th>
+                                <th class="text-center">操作</th>
+                            </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="payFeeConfigDiscount in payFeeConfigDiscountManageInfo.payFeeConfigDiscounts">
-                            <td class="text-center">{{payFeeConfigDiscount.configDiscountId}}</td>
-                            <td class="text-center">{{payFeeConfigDiscountManageInfo.feeName}}</td>
-                            <td class="text-center">{{payFeeConfigDiscount.discountName}}</td>
-                            <td class="text-center">
-                                <div v-for="(item,index) in payFeeConfigDiscount.feeDiscountSpecs">
-                                    {{item.specName}}：{{item.specValue}}
-                                </div>
-                            </td>
-                            <td class="text-center">{{payFeeConfigDiscount.discountType == '1001'?'优惠':'违约'}}</td>
-                            <td class="text-center">{{payFeeConfigDiscount.startTime}}</td>
-                            <td class="text-center">{{payFeeConfigDiscount.endTime}}</td>
-                            <td class="text-center">{{payFeeConfigDiscount.payMaxEndTime}}</td>
-                            <td class="text-center">
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs"
-                                            v-on:click="_openDeletePayFeeConfigDiscountModel(payFeeConfigDiscount)">删除
+                            <tr v-for="payFeeConfigDiscount in payFeeConfigDiscountManageInfo.payFeeConfigDiscounts">
+                                <td class="text-center">{{payFeeConfigDiscount.configDiscountId}}</td>
+                                <td class="text-center">{{payFeeConfigDiscountManageInfo.feeName}}</td>
+                                <td class="text-center">{{payFeeConfigDiscount.discountName}}</td>
+                                <td class="text-center">
+                                    <div v-for="(item,index) in payFeeConfigDiscount.feeDiscountSpecs">
+                                        {{item.specName}}：{{item.specValue}}
+                                    </div>
+                                </td>
+                                <td class="text-center">{{payFeeConfigDiscount.discountType == '1001'?'优惠':'违约'}}</td>
+                                <td class="text-center">{{payFeeConfigDiscount.startTime}}</td>
+                                <td class="text-center">{{payFeeConfigDiscount.endTime}}</td>
+                                <td class="text-center">{{payFeeConfigDiscount.payMaxEndTime}}</td>
+                                <td class="text-center">
+                                    <div class="btn-group">
+                                        <button class="btn-white btn btn-xs" v-on:click="_openDeletePayFeeConfigDiscountModel(payFeeConfigDiscount)">删除
                                     </button>
-                                </div>
-                            </td>
-                        </tr>
+                                    </div>
+                                </td>
+                            </tr>
                         </tbody>
                         <tfoot>
-                        <tr>
-                            <td colspan="9">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
+                            <tr>
+                                <td colspan="9">
+                                    <ul class="pagination float-right"></ul>
+                                </td>
+                            </tr>
                         </tfoot>
                     </table>
                     <!-- 分页 -->
-                    <vc:create path="frame/pagination"></vc:create>
+                    <div class="row margin-top-xs">
+                        <div class="col-sm-9">
+                            <div> 缴费起始时间：缴费时间必须大于缴费起始时间才会享受折扣</div>
+                            <div> 缴费结束时间：缴费时间必须小于缴费结束时间才会享受折扣</div>
+                            <div> 折扣终止时间：交完费后的时间不能大于折扣终止时间</div>
+                        </div>
+                        <div class="col-sm-3 float-right">
+                            <vc:create path="frame/pagination"></vc:create>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>