From 9b529709ec63257d1a443651e75f8b0b3f7a8c3e Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 27 Nov 2020 18:11:58 +0800
Subject: [PATCH] 添加 enable过滤
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html | 144 ++++++++++++++++++-----------------------------
1 files changed, 55 insertions(+), 89 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..910844c 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="请输开始时间"
@@ -278,20 +278,11 @@
$('#contractBeginTime').val($('#contractEndTime').val());
} else {
$('#custom_beginTime').val($("#contractBeginTime").val())
- custom_beginTimes.config.min = {
- year: date.year,
- month: date.month - 1,//关键
- date: date.date,
- hours: date.hours,
- minutes: date.minutes,
- seconds: date.seconds
- }
}
}
});
var contractEndTime = laydate.render({
elem: '#contractEndTime', //指定元素
- // min: $("#contractEndTime_not").val(),
done: function (value, date, endDate) {
var startDate = new Date($('#contractBeginTime').val()).getTime();
var endTime = new Date(value).getTime();
@@ -300,23 +291,7 @@
$('#contractEndTime').val($('#contractBeginTime').val());
} else {
$('#custom_endTime').val($("#contractEndTime").val())
- custom_endTimes.config.max = {
- year: date.year,
- month: date.month - 1,//关键
- date: date.date,
- hours: date.hours,
- minutes: date.minutes,
- seconds: date.seconds
- }
- var begin = new Date($("#contractBeginTime").val())
- custom_endTimes.config.min = {
- year: layui.util.toDateString(begin, "yyyy"),
- month: layui.util.toDateString(begin, "MM") - 1,//关键
- date: layui.util.toDateString(begin, "dd"),
- hours: layui.util.toDateString(begin, "HH"),
- minutes: layui.util.toDateString(begin, "mm"),
- seconds: layui.util.toDateString(begin, "ss")
- }
+
}
}
@@ -327,32 +302,7 @@
laydate.render({
elem: '#contractEndTime_not' //指定元素
});
- var custom_beginTimes = laydate.render({
- elem: '#custom_beginTime', //指定元素
- // min: $("#contractEndTime").val(),
- // man: $("#contractBeginTime").val(),
- done: function (value, date, endDate) {
- var startDate = new Date(value).getTime();
- var endTime = new Date($('#custom_endTime').val()).getTime();
- if (endTime < startDate) {
- layer.msg('结束时间不能小于开始时间');
- $('#custom_beginTime').val($('#custom_endTime').val());
- }
- }
- });
- var custom_endTimes = laydate.render({
- elem: '#custom_endTime', //指定元素
- // min: $("#contractEndTime").val(),
- // man: $("#contractBeginTime").val(),
- done: function (value, date, endDate) {
- var startDate = new Date($('#custom_beginTime').val()).getTime();
- var endTime = new Date(value).getTime();
- if (endTime < startDate) {
- layer.msg('结束时间不能小于开始时间');
- $('#custom_endTime').val($('#custom_beginTime').val());
- }
- }
- });
+
//现将临时数据清理
admin.putTempData("t_tempProduct", "");
//待充值列表
@@ -513,6 +463,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) {
@@ -553,35 +505,46 @@
},"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")
+ //限制自定义的时间
+ function xianzhi(){
+ var custom_beginTimesd = laydate.render({
+ elem: '#custom_beginTime', //指定元素
+ min: $("#contractBeginTime").val(),
+ max: $("#contractEndTime").val(),
+ done: function (value, date, endDate) {
+ var startDate = new Date(value).getTime();
+ var endTime = new Date($('#custom_endTime').val()).getTime();
+ if (endTime < startDate) {
+ layer.msg('结束时间不能小于开始时间');
+ $('#custom_beginTime').val($('#custom_endTime').val());
}
}
-
- },"get")
+ });
+ var custom_endTimes = laydate.render({
+ elem: '#custom_endTime', //指定元素
+ min: $("#contractBeginTime").val(),
+ max: $("#contractEndTime").val(),
+ done: function (value, date, endDate) {
+ var startDate = new Date($('#custom_beginTime').val()).getTime();
+ var endTime = new Date(value).getTime();
+ if (endTime < startDate) {
+ layer.msg('结束时间不能小于开始时间');
+ $('#custom_endTime').val($('#custom_beginTime').val());
+ }
+ }
+ });
}
+ //获取软件的服务周期
+ 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"));
+ }
+ }, "get")
+ }
//回显医院基本数据
let hospitalData = admin.getTempData('t_hospital');
@@ -602,10 +565,10 @@
} 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);
+ //限制时间
+ xianzhi();
+ getCycleTime();
getHospitalAddress(hospitalData.hospitalId);
//装载产品数据
table.render({
@@ -731,7 +694,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 +758,6 @@
$("#submit").click(function () {
submit();
})
- getCycleTime(hospitalData.departmentId);
}
//已充值列表 功能操作
table.on('tool(product-table-now)', function (obj) {
@@ -899,23 +863,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;
}
@@ -975,7 +942,6 @@
}
}
function submit() {
- console.log(1111111)
if (!isRun) {
layer.load(2);
var listData = admin.getTempData("t_tempProduct");
--
Gitblit v1.8.0