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

houruijun

2020-11-27 3ecb43bd5455df7c541d382370c981c4ffa24853

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

@@ -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;
                }