From c97f86ffb7e81821af5761b424eca66c0a98d946 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Mon, 4 Mar 2024 11:36:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9C=AC=E5=9C=B0=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addPayFeeConfigDiscount.html              | 146 +++++++-------
 .../payFeeConfigDiscountManage.html           | 178 ++++++++----------
 2 files changed, 152 insertions(+), 172 deletions(-)

diff --git a/public/components/property/addPayFeeConfigDiscount/addPayFeeConfigDiscount.html b/public/components/property/addPayFeeConfigDiscount/addPayFeeConfigDiscount.html
index cca2c11a5..48a4085bb 100644
--- a/public/components/property/addPayFeeConfigDiscount/addPayFeeConfigDiscount.html
+++ b/public/components/property/addPayFeeConfigDiscount/addPayFeeConfigDiscount.html
@@ -1,89 +1,83 @@
 <div id="addPayFeeConfigDiscountModel" class="modal fade" tabindex="-1" role="dialog"
-     aria-labelledby="exampleModalLabel" aria-hidden="true">
+    aria-labelledby="exampleModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
                 <h3 class="m-t-none m-b ">
-                    <span><vc:i18n name="添加" namespace="addPayFeeConfigDiscount"></vc:i18n></span>
+                    <vc:i18n name="添加" namespace="addPayFeeConfigDiscount"></vc:i18n>
                 </h3>
                 <div class="ibox-content">
-                    <div>
-                        <div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="折扣类型" namespace="addPayFeeConfigDiscount"></vc:i18n></span>
-                                </label>
-                                <div class="col-sm-10">
-                                    <select class="custom-select" v-model="addPayFeeConfigDiscountInfo.discountType"
-                                            @change="_changeAddPayFeeConfigDiscountType()">
-                                        <option selected disabled value="">
-                                            {{vc.i18n('必填','addPayFeeConfigDiscount')}}，请选择折扣类型
-                                        </option>
-                                        <option value="1001">{{vc.i18n('优惠','addPayFeeConfigDiscount')}}</option>
-                                        <option value="2002">{{vc.i18n('违约','addPayFeeConfigDiscount')}}</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="折扣名称" namespace="addPayFeeConfigDiscount"></vc:i18n></span>
-                                </label>
-                                <div class="col-sm-10">
-                                    <select class="custom-select" v-model="addPayFeeConfigDiscountInfo.discountId">
-                                        <option selected disabled value="">
-                                            {{vc.i18n('必填','addPayFeeConfigDiscount')}}，请选择折扣名称
-                                        </option>
-                                        <option v-for="(item,index) in addPayFeeConfigDiscountInfo.discounts"
-                                                :value="item.discountId">{{item.discountName}}
-                                        </option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="缴费起始时间" namespace="addPayFeeConfigDiscount"></vc:i18n></span>
-                                </label>
-                                <div class="col-sm-10">
-                                    <input v-model="addPayFeeConfigDiscountInfo.startTime" type="text"
-                                           :placeholder="vc.i18n('必填，请填写缴费起始时间','addPayFeeConfigDiscount')"
-                                           class="form-control addPayFeeConfigDiscountStartTime" name="startTime">
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="缴费结束时间" namespace="addPayFeeConfigDiscount"></vc:i18n></span>
-                                </label>
-                                <div class="col-sm-10">
-                                    <input v-model="addPayFeeConfigDiscountInfo.endTime" type="text"
-                                           :placeholder="vc.i18n('必填，请填写缴费结束时间','addPayFeeConfigDiscount')"
-                                           class="form-control addPayFeeConfigDiscountEndTime" name="endTime">
-                                </div>
-                            </div>
-                            <div class="form-group row" v-if="addPayFeeConfigDiscountInfo.discountType != '2002'">
-                                <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="折扣终止时间" namespace="addPayFeeConfigDiscount"></vc:i18n></span>
-                                </label>
-                                <div class="col-sm-10">
-                                    <input v-model="addPayFeeConfigDiscountInfo.payMaxEndTime" type="text"
-                                           :placeholder="vc.i18n('可选，填写折扣终止时间','addPayFeeConfigDiscount')"
-                                           class="form-control addPayFeeConfigDiscountPaymaxEndTime"
-                                           name="payMaxEndTime">
-                                </div>
-                            </div>
-                            <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button"
-                                        v-on:click="savePayFeeConfigDiscountInfo()">
-                                    <i class="fa fa-check"></i>&nbsp;保存
-                                </button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
-                                        data-dismiss="modal">
-                                    <i class="fa fa-times"></i>&nbsp;取消
-                                </button>
-                            </div>
+                    <div class="form-group row">
+                        <label class="col-sm-2 col-form-label">
+                            <vc:i18n name="折扣类型" namespace="addPayFeeConfigDiscount"></vc:i18n>
+                        </label>
+                        <div class="col-sm-10">
+                            <select class="custom-select" v-model="addPayFeeConfigDiscountInfo.discountType"
+                                @change="_changeAddPayFeeConfigDiscountType()">
+                                <option selected disabled value="">
+                                    {{vc.i18n('必填','addPayFeeConfigDiscount')}}，请选择折扣类型
+                                </option>
+                                <option value="1001">{{vc.i18n('优惠','addPayFeeConfigDiscount')}}</option>
+                                <option value="2002">{{vc.i18n('违约','addPayFeeConfigDiscount')}}</option>
+                            </select>
                         </div>
                     </div>
+                    <div class="form-group row">
+                        <label class="col-sm-2 col-form-label">
+                            <vc:i18n name="折扣名称" namespace="addPayFeeConfigDiscount"></vc:i18n>
+                        </label>
+                        <div class="col-sm-10">
+                            <select class="custom-select" v-model="addPayFeeConfigDiscountInfo.discountId">
+                                <option selected disabled value="">
+                                    {{vc.i18n('必填','addPayFeeConfigDiscount')}}，请选择折扣名称
+                                </option>
+                                <option v-for="(item,index) in addPayFeeConfigDiscountInfo.discounts"
+                                    :value="item.discountId">{{item.discountName}}
+                                </option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label class="col-sm-2 col-form-label">
+                            <vc:i18n name="缴费时间段" namespace="addPayFeeConfigDiscount"></vc:i18n>
+                        </label>
+                        <div class="col-sm-4">
+                            <input v-model="addPayFeeConfigDiscountInfo.startTime" type="text"
+                                :placeholder="vc.i18n('必填，请填写缴费起始时间','addPayFeeConfigDiscount')"
+                                class="form-control addPayFeeConfigDiscountStartTime" name="startTime">
+                            <span>这段时间内缴费才能享受该优惠</span>
+                        </div>
+                        <div class="col-sm-4">
+                            <input v-model="addPayFeeConfigDiscountInfo.endTime" type="text"
+                                :placeholder="vc.i18n('必填，请填写缴费结束时间','addPayFeeConfigDiscount')"
+                                class="form-control addPayFeeConfigDiscountEndTime" name="endTime">
+                        </div>
+
+                    </div>
+                    <div class="form-group row" v-if="addPayFeeConfigDiscountInfo.discountType != '2002'">
+                        <label class="col-sm-2 col-form-label">
+                            <vc:i18n name="折扣终止时间" namespace="addPayFeeConfigDiscount"></vc:i18n>
+                        </label>
+                        <div class="col-sm-10">
+                            <input v-model="addPayFeeConfigDiscountInfo.payMaxEndTime" type="text"
+                                :placeholder="vc.i18n('可选，填写折扣终止时间','addPayFeeConfigDiscount')"
+                                class="form-control addPayFeeConfigDiscountPaymaxEndTime" name="payMaxEndTime">
+                            <span>最大缴费到什么时候，比如想2024年费用优惠，那么就填写2025-01-01</span>
+                        </div>
+                    </div>
+                    <div class="ibox-content">
+                        <button class="btn btn-primary float-right" type="button"
+                            v-on:click="savePayFeeConfigDiscountInfo()">
+                            <i class="fa fa-check"></i>&nbsp;保存
+                        </button>
+                        <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                            data-dismiss="modal">
+                            <i class="fa fa-times"></i>&nbsp;取消
+                        </button>
+                    </div>
                 </div>
+
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.html b/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.html
index 10463c9f8..b821a5ac1 100644
--- a/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.html
+++ b/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.html
@@ -1,101 +1,87 @@
 <div>
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox">
-                <div class="ibox-title">
-                    <h5>
-                        <vc:i18n name="费用折扣" namespace="payFeeConfigDiscountManage"></vc:i18n>
-                    </h5>
-                    <div class="ibox-tools" style="top:10px;">
-                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_goBack()">
-                            <vc:i18n name="返回"></vc:i18n>
-                        </button>
-                        <button type="button" class="btn btn-primary btn-sm"
-                            v-on:click="_openAddPayFeeConfigDiscountModal()">
-                            <i class="fa fa-plus"></i>
-                            <span>
-                                <vc:i18n name="添加" namespace="payFeeConfigDiscountManage"></vc:i18n>
-                            </span>
-                        </button>
-                    </div>
+
+    <div class="ibox">
+        <div class="ibox-title">
+            <h5>
+                <vc:i18n name="费用折扣" namespace="payFeeConfigDiscountManage"></vc:i18n>
+            </h5>
+            <div class="ibox-tools" style="top:10px;">
+                <button type="button" class="btn btn-primary btn-sm" v-on:click="_goBack()">
+                    <vc:i18n name="返回"></vc:i18n>
+                </button>
+                <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddPayFeeConfigDiscountModal()">
+                    <i class="fa fa-plus"></i>
+                    <span>
+                        <vc:i18n name="添加" namespace="payFeeConfigDiscountManage"></vc:i18n>
+                    </span>
+                </button>
+            </div>
+        </div>
+        <div class="ibox-content">
+            <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
+                <thead>
+                    <tr>
+                        <th class="text-center">
+                            <vc:i18n name="费用折扣ID" namespace="payFeeConfigDiscountManage"></vc:i18n>
+                        </th>
+                        <th class="text-center">
+                            <vc:i18n name="费用项名称" namespace="payFeeConfigDiscountManage"></vc:i18n>
+                        </th>
+                        <th class="text-center">
+                            <vc:i18n name="折扣名称" namespace="payFeeConfigDiscountManage"></vc:i18n>
+                        </th>
+                        <th class="text-center">
+                            <vc:i18n name="规则" namespace="payFeeConfigDiscountManage"></vc:i18n>
+                        </th>
+                        <th class="text-center">
+                            <vc:i18n name="折扣类型" namespace="payFeeConfigDiscountManage"></vc:i18n>
+                        </th>
+                        <th class="text-center">
+                            <vc:i18n name="缴费时间段" namespace="payFeeConfigDiscountManage"></vc:i18n>
+                        </th>
+                        <th class="text-center">
+                            <vc:i18n name="折扣终止时间" namespace="payFeeConfigDiscountManage"></vc:i18n>
+                        </th>
+                        <th class="text-center">
+                            <vc:i18n name="操作" namespace="payFeeConfigDiscountManage"></vc:i18n>
+                        </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}}</br>
+                            ~{{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)">
+                                    <vc:i18n name="删除" namespace="payFeeConfigDiscountManage"></vc:i18n>
+                                </button>
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+            <!-- 分页 -->
+            <div class="row margin-top-xs">
+                <div class="col-sm-9">
+                    <div> 缴费时间段：这个约束缴费的时间，也就是前台收银员操作缴费的时间</div>
+                    <div> 折扣终止时间：这个表示最大缴费到什么时候</div>
+                    <div> 如果本年度费用不能享受优惠 那么在折扣设置中规则选择打折无欠费规则，并且欠费时长为0</div>
+                    <div> 这样所有欠费的费用则不享受优惠，本年度的费用属于欠费所以不享受优惠</div>
                 </div>
-                <div class="ibox-content">
-                    <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
-                        <thead>
-                            <tr>
-                                <th class="text-center">
-                                    <vc:i18n name="费用折扣ID" namespace="payFeeConfigDiscountManage"></vc:i18n>
-                                </th>
-                                <th class="text-center">
-                                    <vc:i18n name="费用项名称" namespace="payFeeConfigDiscountManage"></vc:i18n>
-                                </th>
-                                <th class="text-center">
-                                    <vc:i18n name="折扣名称" namespace="payFeeConfigDiscountManage"></vc:i18n>
-                                </th>
-                                <th class="text-center">
-                                    <vc:i18n name="规则" namespace="payFeeConfigDiscountManage"></vc:i18n>
-                                </th>
-                                <th class="text-center">
-                                    <vc:i18n name="折扣类型" namespace="payFeeConfigDiscountManage"></vc:i18n>
-                                </th>
-                                <th class="text-center">
-                                    <vc:i18n name="缴费起始时间" namespace="payFeeConfigDiscountManage"></vc:i18n>
-                                </th>
-                                <th class="text-center">
-                                    <vc:i18n name="缴费结束时间" namespace="payFeeConfigDiscountManage"></vc:i18n>
-                                </th>
-                                <th class="text-center">
-                                    <vc:i18n name="折扣终止时间" namespace="payFeeConfigDiscountManage"></vc:i18n>
-                                </th>
-                                <th class="text-center">
-                                    <vc:i18n name="操作" namespace="payFeeConfigDiscountManage"></vc:i18n>
-                                </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)">
-                                            <vc:i18n name="删除" namespace="payFeeConfigDiscountManage"></vc:i18n>
-                                        </button>
-                                    </div>
-                                </td>
-                            </tr>
-                        </tbody>
-                        <tfoot>
-                            <tr>
-                                <td colspan="9">
-                                    <ul class="pagination float-right"></ul>
-                                </td>
-                            </tr>
-                        </tfoot>
-                    </table>
-                    <!-- 分页 -->
-                    <div class="row margin-top-xs">
-                        <div class="col-sm-9">
-                            <div> 缴费起始时间和缴费结束时间：这个约束缴费的时间，也就是前台收银员操作缴费的时间</div>
-                            <div> 折扣终止时间：这个表示最大缴费到什么时候</div>
-                            <div> 如果本年度费用不能享受优惠 那么在折扣设置中规则选择打折无欠费规则，并且欠费时长为0</div>
-                            <div> 这样所有欠费的费用则不享受优惠，本年度的费用属于欠费所以不享受优惠</div>
-                        </div>
-                        <div class="col-sm-3 float-right">
-                            <vc:create path="frame/pagination"></vc:create>
-                        </div>
-                    </div>
+                <div class="col-sm-3 float-right">
+                    <vc:create path="frame/pagination"></vc:create>
                 </div>
             </div>
         </div>