Merge remote-tracking branch 'origin/dev' into dev

houruijun

2020-11-27 fbf6a877aae46e19a8d3c0058cefa3f81c72715f

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

@@ -156,7 +156,7 @@
                                <label class="layui-form-label">充值名称：</label>
                                <div class="layui-input-inline">
                                    <input autocomplete="off" id="custom_proName" type="text" class="layui-input"
                                        maxlength="50" lay-verify="required" required />
                                        maxlength="50" />
                                </div>
                            </div>
                        </div>
@@ -168,12 +168,12 @@
                                <div class="layui-input-inline">
                                    <input autocomplete="off" id="custom_ailightCount"
                                        onkeyup="this.value=this.value.replace(/[^\d]/g,'') " type="text"
                                        class="layui-input" maxlength="50" lay-verify="required" required />
                                        class="layui-input" maxlength="50" />
                                </div>
                            </div>
                            <div class="layui-col-sm6">
                                <div class="layui-input-inline">
                                    <input type="radio" id="custom_isShare" name="gongxiang" value="1" title="是否共享" />
                                    <input type="checkbox" id="custom_isShare" name="gongxiang" value="1" lay-skin="primary" title="是否共享" />
                                </div>
                            </div>
                        </div>
@@ -182,7 +182,7 @@
                        <div class="layui-row">
                            <div class="layui-col-sm12">
                                <div class="layui-input-inline" style="width: 160px;text-align: right;">
                                    <input type="radio" id="termType" name="termType" value="true" checked
                                    <input type="checkbox" id="termType" lay-skin="primary" name="termType" value="true" checked
                                        title="期限限制" />
                                </div>
                                <div class="layui-col-sm4" style="margin-right: 30px;">
@@ -616,7 +616,9 @@
                var listNum = 0;
                if (!strUtil.isEmpty(listData)) {
                    listData.forEach(item => {
                        listNum += item.ailightCount;
                        if(item.proType==1){
                            listNum += item.ailightCount;
                        }
                    })
                }
                if ($("#contractNum").val() < listNum) {
@@ -748,21 +750,23 @@
        });
        function isthenNum(num) {
            if (num <= 0) {
                return "请输入读片量大于0";
                return "请输入合同读片充值量大于0";
            }
            var listData = admin.getTempData("t_tempProduct");
            var listNum = 0;
            if (!strUtil.isEmpty(listData)) {
                listData.forEach(item => {
                    listNum += item.ailightCount;
                    if(item.proType==1){
                        listNum += item.ailightCount;
                    }
                })
            }
            listNum += num;
            if ($("#contractNum").val() == undefined || $("#contractNum").val() == "") {
                return "请输入读片量！";
                return "请输入合同读片充值量！";
            } else {
                if ($("#contractNum").val() < listNum) {
                    return "当前产品总数不得大于合同总量";
                    return "当前产品总数不得大于合同读片充值量";
                } else {
                    return null;
                }