From 3acf3d5ee9435576276453ad0fbe0d8f202f10e4 Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <279049017@qq.com> Date: Fri, 27 Nov 2020 19:33:52 +0800 Subject: [PATCH] 修改查询到期的接口 --- kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html index 27257d1..1b175da 100644 --- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html +++ b/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; } @@ -878,7 +882,7 @@ proBegintime: item.beginTime != "" ? item.beginTime + ' 00:00:00' : "", proEndtime: item.endTime != "" ? item.endTime + - ' 23:59:59' : "", + ' 00:00:00' : "", orderAilightCount: item.ailightCount, orderRecordCount: item.recordCount != null ? item.recordCount : 0, }; -- Gitblit v1.8.0