Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html

@@ -1,4 +1,4 @@
<form id="recharge-form" lay-filter="recharge-form" class="layui-form">
<form id="recharge-form" lay-filter="recharge-form" autocomplete="off" class="layui-form">
    <div style="overflow-y: auto; height:700px;">
        <div class="layui-tab">
            <ul class="layui-tab-title">
@@ -92,11 +92,11 @@
                                <div class="layui-input-block">
                                    <input autocomplete="off" name="contractBeginTime" id="contractBeginTime"
                                        type="text" placeholder="请输开始时间" disabled class="layui-input" readonly
                                        style="border: none; margin-top:-10px;display: inline-block;width: 46%;" />
                                        style="border: none; margin-top:-10px;display: inline-block;width: 30%;" />
                                    --
                                    <input autocomplete="off" name="contractEndTime" disabled id="contractEndTime"
                                        type="text" placeholder="请输入结束时间" class="layui-input" readonly
                                        style="border: none; margin-top:-10px;display: inline-block;width: 46%;" />
                                        style="border: none; margin-top:-10px;margin-left: 10%;display: inline-block;width: 30%;" />
                                </div>
                            </div>
                            <div class="layui-col-sm3">
@@ -888,8 +888,6 @@
                    }
                }
                if (!strUtil.isEmpty(data.endTime)) {
                    console.log(contractEndTime, "contractEndTime")
                    console.log(data.endTime, "data.endTimedata.endTime")
                    if (dateUtil.compareDate(data.endTime, contractEndTime)) {
                        layer.msg("结束时间必须小于合同的结束时间！");
                        return false;