From 490e34b56f57f920ad3208143a43ab9a388b8f14 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: Sat, 12 Dec 2020 19:35:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=B4=E8=B4=B9=E6=88=AA?=
 =?UTF-8?q?=E6=AD=A2=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addPayFeeConfigDiscount.html              | 15 +++++++++----
 .../addPayFeeConfigDiscount.js                | 22 +++++++++++++++++++
 .../payFeeConfigDiscountManage.html           |  6 +++--
 3 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/public/components/property/addPayFeeConfigDiscount/addPayFeeConfigDiscount.html b/public/components/property/addPayFeeConfigDiscount/addPayFeeConfigDiscount.html
index de4d87297..0a8148263 100644
--- a/public/components/property/addPayFeeConfigDiscount/addPayFeeConfigDiscount.html
+++ b/public/components/property/addPayFeeConfigDiscount/addPayFeeConfigDiscount.html
@@ -27,19 +27,26 @@
                                     </select> </div>
                             </div>
                             <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">有效期起始时间</label>
+                                <label class="col-sm-2 col-form-label">折扣起始时间</label>
                                 <div class="col-sm-10">
-                                    <input v-model="addPayFeeConfigDiscountInfo.startTime" type="text" placeholder="必填，请填写有效期起始时间"
+                                    <input v-model="addPayFeeConfigDiscountInfo.startTime" type="text" placeholder="必填，请填写折扣起始时间"
                                         class="form-control addPayFeeConfigDiscountStartTime" name="startTime">
                                 </div>
                             </div>
                             <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">有效期终止时间</label>
+                                <label class="col-sm-2 col-form-label">折扣终止时间</label>
                                 <div class="col-sm-10">
-                                    <input v-model="addPayFeeConfigDiscountInfo.endTime" type="text" placeholder="必填，请填写有效期终止时间"
+                                    <input v-model="addPayFeeConfigDiscountInfo.endTime" type="text" placeholder="必填，请填写折扣终止时间"
                                         class="form-control addPayFeeConfigDiscountEndTime" name="endTime">
                                 </div>
                             </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">上次缴费最大时间</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addPayFeeConfigDiscountInfo.payMaxEndTime" type="text" placeholder="可选，填写上次缴费最大时间"
+                                        class="form-control addPayFeeConfigDiscountPaymaxEndTime" name="payMaxEndTime">
+                                </div>
+                            </div>
 
                             <div class="ibox-content">
                                 <button class="btn btn-primary float-right" type="button"
diff --git a/public/components/property/addPayFeeConfigDiscount/addPayFeeConfigDiscount.js b/public/components/property/addPayFeeConfigDiscount/addPayFeeConfigDiscount.js
index 14bff461a..4d8b10154 100644
--- a/public/components/property/addPayFeeConfigDiscount/addPayFeeConfigDiscount.js
+++ b/public/components/property/addPayFeeConfigDiscount/addPayFeeConfigDiscount.js
@@ -14,6 +14,7 @@
                 discounts: [],
                 startTime: '', // 新增开始时间
                 endTime: '', // 结束时间
+                payMaxEndTime: '', // 上次缴费最大时间
             }
         },
         _initMethod: function () {
@@ -66,6 +67,21 @@
                             vc.component.addPayFeeConfigDiscountInfo.endTime = value;
                         }
                     });
+                // 新增用于比较用户上次缴费时间字段
+                $('.addPayFeeConfigDiscountPaymaxEndTime').datetimepicker({
+                    language: 'zh-CN',
+                    fontAwesome: 'fa',
+                    format: 'yyyy-mm-dd hh:ii:ss',
+                    initTime: true,
+                    initialDate: new Date(),
+                    autoClose: 1,
+                    todayBtn: true
+                });
+                $('.addPayFeeConfigDiscountPaymaxEndTime').datetimepicker()
+                    .on('changeDate', function (ev) {
+                        var value = $(".addPayFeeConfigDiscountPaymaxEndTime").val();
+                        vc.component.addPayFeeConfigDiscountInfo.payMaxEndTime = value;
+                    });
                 //防止多次点击时间插件失去焦点
                 document.getElementsByName('startTime')[0].addEventListener('click', myfunc)
 
@@ -78,6 +94,12 @@
                 function myfunc(e) {
                     e.currentTarget.blur();
                 }
+
+                document.getElementsByName("payMaxEndTime")[0].addEventListener('click', myfunc)
+
+                function myfunc(e) {
+                    e.currentTarget.blur();
+                }
             },
             addPayFeeConfigDiscountValidate() {
                 return vc.validate.validate({
diff --git a/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.html b/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.html
index 4411ea946..f931de159 100644
--- a/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.html
+++ b/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.html
@@ -25,8 +25,9 @@
                                 <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>
@@ -43,6 +44,7 @@
                                 <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"