From a40b70f8ff9c95590f05234916948943ed2c1d8d Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 01 Dec 2020 19:40:09 +0800
Subject: [PATCH] 修改时间的bug，修改添加合同不显示的bug
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html | 92 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 82 insertions(+), 10 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 8c2e17b..aaeb400 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
@@ -84,12 +84,12 @@
<input autocomplete="off" name="contractBeginTime_not" disabled
id="contractBeginTime_not" type="text" placeholder="请输开始时间" class="layui-input"
maxlength="50" readonly
- style="border: none; display: inline-block;width: 40%;" />
+ style="border: none; display: inline-block;width: 30%;" />
<span id="contractBeginTime_not_heng"> 至 </span>
<input autocomplete="off" name="contractEndTime_not" disabled
id="contractEndTime_not" type="text" placeholder="请输入结束时间" class="layui-input"
maxlength="50" readonly
- style="border: none; display: inline-block;width: 40%;" />
+ style="border: none; margin-left: 10%;display: inline-block;width: 30%;" />
</div>
</div>
<div class="layui-col-sm6">
@@ -256,6 +256,8 @@
var laydate = layui.laydate;
var contractNum = 0;
+ var contractBeginTime_cheng = "";
+ var contractEndTime_cheng = "";
//充值进行中
var isRun = false;
@@ -265,10 +267,16 @@
done: function (value, date, endDate) {
var startDate = new Date(value).getTime();
var endTime = new Date($('#contractEndTime').val()).getTime();
- if (endTime < startDate) {
- layer.msg('结束时间不能小于开始时间');
- $('#contractBeginTime').val($('#contractEndTime').val());
+ if (endTime <= startDate) {
+ layer.msg('结束时间不能小于或等于开始时间');
+ var end = new Date($('#contractEndTime').val())
+ end.setDate(end.getDate()-1)
+ $('#contractBeginTime').val(util.toDateString(end, "yyyy-MM-dd"));
} else {
+ var flag=termTypeTime();
+ if(!false){
+ return false;
+ }
$('#custom_beginTime').val($("#contractBeginTime").val())
custom_beginTimes.config.min = {
year: date.year,
@@ -287,10 +295,17 @@
done: function (value, date, endDate) {
var startDate = new Date($('#contractBeginTime').val()).getTime();
var endTime = new Date(value).getTime();
- if (endTime < startDate) {
- layer.msg('结束时间不能小于开始时间');
- $('#contractEndTime').val($('#contractBeginTime').val());
+ if (endTime <= startDate) {
+ layer.msg('结束时间不能小于或等于开始时间');
+ var begin = new Date($('#contractBeginTime').val())
+ begin.setDate(begin.getDate()+1)
+ $('#contractEndTime').val(util.toDateString(begin, "yyyy-MM-dd"));
+ // $('#contractEndTime').val($('#contractBeginTime').val());
} else {
+ var flag=termTypeTime();
+ if(!false){
+ return false;
+ }
$('#custom_endTime').val($("#contractEndTime").val())
custom_endTimes.config.max = {
year: date.year,
@@ -313,6 +328,44 @@
}
}
});
+ function termTypeTime(){
+ var listData = admin.getTempData("t_tempProduct");
+ var max= "";
+ var min= '';
+ if(listData!=null&&listData.length>0){
+
+ listData.forEach((element,index) => {
+ debugger
+ if(index==0){
+ max=element.endTime;
+ min=element.beginTime;
+ }else{
+ if (dateUtil.compareDate(min, element.beginTime)) {
+ min=element.beginTime;
+ }
+ if (dateUtil.compareDate( element.endTime,max)) {
+ max=element.endTime;
+ }
+ }
+
+ });
+ }
+ if(dateUtil.compareDate( $('#contractBeginTime').val(),min)){
+ layer.msg("合同的时间必须小于待充值的开始时间")
+ $('#contractBeginTime').val(contractBeginTime_cheng);
+ return false;
+ }else{
+ contractBeginTime_cheng=$('#contractBeginTime').val()
+ }
+ if(dateUtil.compareDate(max, $('#contractEndTime').val())){
+ layer.msg("合同的时间必须小于待充值的开始时间")
+ $('#contractEndTime').val(contractEndTime_cheng);
+ return false;
+ }else{
+ contractEndTime_cheng=$('#contractEndTime').val()
+ }
+
+ }
laydate.render({
elem: '#contractBeginTime_not' //指定元素
});
@@ -641,6 +694,8 @@
return false;
} else {
contractNum = $("#contractNum").val();
+ //将自定义的读片量赋值
+ $("#custom_ailightCount").val($("#contractNum").val()-listNum);
}
})
//自定义的确定
@@ -699,6 +754,8 @@
if (!strUtil.isEmpty(obj.data.id)) {
delTempDataById(obj.data.id);
obj.del();
+ //将自定义的数量赋值
+ zidingyiNum()
}
}
});
@@ -771,6 +828,8 @@
data.id = data.id + '';
tempDataList(data);
waitRecharge();
+ //将自定义的数量赋值
+ zidingyiNum()
} else {
layer.msg("结束时间必须大于开始时间！");
return false;
@@ -781,6 +840,19 @@
}
}
});
+ //将自定义的数量重新赋值
+ function zidingyiNum(){
+ var listData = admin.getTempData("t_tempProduct");
+ var listNum = 0;
+ if (!strUtil.isEmpty(listData)) {
+ listData.forEach(item => {
+ if(item.proType==1){
+ listNum += item.ailightCount;
+ }
+ })
+ }
+ $("#custom_ailightCount").val($("#contractNum").val()-listNum);
+ }
function isthenNum(num) {
if (num <= 0) {
return "请输入合同读片充值量大于0";
@@ -893,7 +965,7 @@
}
if(count!=data.field.contractNum){
layer.closeAll('loading');
- layer.msg("合同读片充值量与套餐数量不一致")
+ layer.msg("合同读片充值量与套餐充值量不一致")
return false;
}
if (data.field != null) {
@@ -965,7 +1037,7 @@
}
}, 'POST');
} else {
- layer.msg("充值数据异常为空！", {
+ layer.msg("充值数据成功！", {
icon: 2,
time: 1000
});
--
Gitblit v1.8.0