From c10ddf5cc30fc3f5d889f597e0a4d13fb52f048a Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <279049017@qq.com> Date: Fri, 27 Nov 2020 11:51:24 +0800 Subject: [PATCH] 优化套餐充值 --- kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html | 77 ++++++++++++++++++++------------------ 1 files changed, 40 insertions(+), 37 deletions(-) diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html index 457e557..343a3a7 100644 --- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html +++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html @@ -167,7 +167,7 @@ </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" lay-skin="primary" id="custom_isShare" name="gongxiang" value="1" title="是否共享" /> </div> </div> </div> @@ -176,7 +176,7 @@ <div class="layui-row"> <div class="layui-col-sm12"> <div class="layui-input-inline" style="width: 120px;text-align: right;"> - <input type="radio" id="termType" name="termType" value="true" checked title="期限限制" /> + <input type="checkbox" lay-skin="primary" id="termType" name="termType" value="true" checked title="期限限制" /> </div> <div class="layui-col-sm4" style="margin-right: 30px;"> <input autocomplete="off" id="custom_beginTime" type="text" placeholder="请输开始时间" @@ -513,6 +513,8 @@ //如果是异步请求数据方式,res即为你接口返回的信息。 //如果是直接赋值的方式,res即为:{data: [], count: 99} data为当前页数据、count为数据总长度 var num = 0; + //已经充值的套餐 + admin.putTempData("t_nowProduct", ""); res.data.forEach(element => { if(element.proType==1){ if (element.enabled) { @@ -554,33 +556,33 @@ },"get") } //获取软件的服务周期 - var getCycleTime=function(departmentId){ - admin.req('api-opration/productorderdetail/getContractBeginEndTimeAndNum' , {departmentId: departmentId}, - function (data) { - if(data.code==0){ - $("#contractBeginTime").val(layui.util.toDateString(data.data.beginTime,"yyyy-MM-dd")); - $("#contractEndTime").val( layui.util.toDateString(data.data.endTime,"yyyy-MM-dd")); - $("#contractNum").val(data.data.count); - contractBeginTime.config.max = { - year: layui.util.toDateString(data.data.beginTime, "yyyy"), - month: layui.util.toDateString(data.data.beginTime, "MM") - 1,//关键 - date: layui.util.toDateString(data.data.beginTime, "dd"), - hours: layui.util.toDateString(data.data.beginTime, "HH"), - minutes: layui.util.toDateString(data.data.beginTime, "mm"), - seconds: layui.util.toDateString(data.data.beginTime, "ss") - } - contractEndTime.config.min = { - year: layui.util.toDateString(data.data.endTime, "yyyy"), - month: layui.util.toDateString(data.data.endTime, "MM") - 1,//关键 - date: layui.util.toDateString(data.data.endTime, "dd"), - hours: layui.util.toDateString(data.data.endTime, "HH"), - minutes: layui.util.toDateString(data.data.endTime, "mm"), - seconds: layui.util.toDateString(data.data.endTime, "ss") - } - } + // var getCycleTime=function(departmentId){ + // admin.req('api-opration/productorderdetail/getContractBeginEndTimeAndNum' , {departmentId: departmentId}, + // function (data) { + // if(data.code==0){ + // $("#contractBeginTime").val(layui.util.toDateString(data.data.beginTime,"yyyy-MM-dd")); + // $("#contractEndTime").val( layui.util.toDateString(data.data.endTime,"yyyy-MM-dd")); + // $("#contractNum").val(data.data.count); + // contractBeginTime.config.max = { + // year: layui.util.toDateString(data.data.beginTime, "yyyy"), + // month: layui.util.toDateString(data.data.beginTime, "MM") - 1,//关键 + // date: layui.util.toDateString(data.data.beginTime, "dd"), + // hours: layui.util.toDateString(data.data.beginTime, "HH"), + // minutes: layui.util.toDateString(data.data.beginTime, "mm"), + // seconds: layui.util.toDateString(data.data.beginTime, "ss") + // } + // contractEndTime.config.min = { + // year: layui.util.toDateString(data.data.endTime, "yyyy"), + // month: layui.util.toDateString(data.data.endTime, "MM") - 1,//关键 + // date: layui.util.toDateString(data.data.endTime, "dd"), + // hours: layui.util.toDateString(data.data.endTime, "HH"), + // minutes: layui.util.toDateString(data.data.endTime, "mm"), + // seconds: layui.util.toDateString(data.data.endTime, "ss") + // } + // } - },"get") - } + // },"get") + // } //回显医院基本数据 @@ -602,9 +604,6 @@ } else { hospitalData.contractBeginTime = layui.util.toDateString(hospitalData.contractBeginTime, 'yyyy-MM-dd') hospitalData.contractEndTime = layui.util.toDateString(hospitalData.contractEndTime, 'yyyy-MM-dd') - delete hospitalData.contractBeginTime - delete hospitalData.contractEndTime - delete hospitalData.contractNum form.val('recharge-form', hospitalData); getHospitalAddress(hospitalData.hospitalId); //装载产品数据 @@ -731,7 +730,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) { @@ -793,7 +794,6 @@ $("#submit").click(function () { submit(); }) - getCycleTime(hospitalData.departmentId); } //已充值列表 功能操作 table.on('tool(product-table-now)', function (obj) { @@ -899,23 +899,26 @@ } } }); + // $("#contractNum_not").val($("#contractNum").val() - num); 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_not").val() == undefined || $("#contractNum_not").val() == "") { - return "请输入读片量!"; + return "请输入合同读片充值量!"; } else { if ($("#contractNum_not").val() < listNum) { - return "当前产品总数不得大于合同总量"; + return "当前产品总数不得大于合同读片充值量"; } else { return null; } -- Gitblit v1.8.0