From 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Mon, 01 Mar 2021 14:14:35 +0800
Subject: [PATCH] Merge branch 'dev1.1' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html | 173 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 120 insertions(+), 53 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 910844c..ac0ff0b 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
@@ -1,4 +1,4 @@
-<form id="recharge-form" lay-filter="recharge-form" class="layui-form">
+<form id="recharge-form" lay-filter="recharge-form" autocomplete="off" class="layui-form">
<div style="overflow-y: auto; height:700px;">
<div class="layui-tab">
<ul class="layui-tab-title">
@@ -92,10 +92,11 @@
<div class="layui-input-block">
<input autocomplete="off" name="contractBeginTime" id="contractBeginTime"
type="text" placeholder="请输开始时间" disabled class="layui-input" readonly
- style="border: none; margin-top:-10px;display: inline-block;width: 46%;" />
- <input autocomplete="off" name="contractEndTime" disabled id="contractEndTime" type="text"
- placeholder="请输入结束时间" class="layui-input" readonly
- style="border: none; margin-top:-10px;display: inline-block;width: 46%;" />
+ style="border: none; margin-top:-10px;display: inline-block;width: 30%;" />
+ --
+ <input autocomplete="off" name="contractEndTime" disabled id="contractEndTime"
+ type="text" placeholder="请输入结束时间" class="layui-input" readonly
+ style="border: none; margin-top:-10px;margin-left: 10%;display: inline-block;width: 30%;" />
</div>
</div>
<div class="layui-col-sm3">
@@ -150,7 +151,7 @@
<label class="layui-form-label">充值名称：</label>
<div class="layui-input-inline">
<input autocomplete="off" id="custom_proName" type="text" class="layui-input"
- maxlength="50" />
+ maxlength="50" />
</div>
</div>
</div>
@@ -162,12 +163,13 @@
<div class="layui-input-inline">
<input autocomplete="off" id="custom_ailightCount"
onkeyup="this.value=this.value.replace(/[^\d]/g,'') " type="text"
- class="layui-input" maxlength="50" />
+ class="layui-input" maxlength="50" />
</div>
</div>
<div class="layui-col-sm6">
<div class="layui-input-inline">
- <input type="checkbox" lay-skin="primary" 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 +178,8 @@
<div class="layui-row">
<div class="layui-col-sm12">
<div class="layui-input-inline" style="width: 120px;text-align: right;">
- <input type="checkbox" lay-skin="primary" 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="请输开始时间"
@@ -190,11 +193,12 @@
</div>
</div>
<div class="layui-form-item">
- <div class="layui-input-block" style="text-align: right;padding-right: 100px;padding-top: 50px;">
+ <div class="layui-input-block"
+ style="text-align: right;padding-right: 100px;padding-top: 50px;">
<input class="layui-btn" type="button" id="custom_submit" value="确定" />
</div>
</div>
-
+
</div>
</div>
</div>
@@ -214,7 +218,7 @@
</div>
<div class="layui-form-item model-form-footer" style="margin-right: 20px;">
<button class="layui-btn layui-btn-primary" ew-event="closeDialog" type="button">取消</button>
- <button class="layui-btn permissions" permissions="product-rechage" lay-submit id="submit">确定充值</button>
+ <button class="layui-btn permissions" permissions="product-rechage" type="button" id="submit">确定充值</button>
</div>
<input type="hidden" value="" id="departmentId" name="departmentId" />
<input type="hidden" value="" id="hospitalId" name="hospitalId" />
@@ -224,7 +228,7 @@
<!-- 表格操作列 -->
<script type="text/html" id="product-tpl-bar-now">
{{# if (d.ailightCount !=d.orderAilightCount){}}
- {{# if (d.enabled){}}
+ {{# if (d.enabled && d.ailightCount>0){}}
<a class="layui-btn layui-btn-xs" lay-event="order_detail_enable">禁用</a>
{{# } else { }}
<a class="layui-btn layui-btn-disabled" >禁用</a>
@@ -267,8 +271,10 @@
//充值进行中
var isRun = false;
+ var contractBeginTimeVVV = "";
+ var contractEndTimeVVV = "";
//执行一个laydate实例
- var contractBeginTime= laydate.render({
+ var contractBeginTime = laydate.render({
elem: '#contractBeginTime', //指定元素
done: function (value, date, endDate) {
var startDate = new Date(value).getTime();
@@ -291,7 +297,7 @@
$('#contractEndTime').val($('#contractBeginTime').val());
} else {
$('#custom_endTime').val($("#contractEndTime").val())
-
+
}
}
@@ -302,7 +308,7 @@
laydate.render({
elem: '#contractEndTime_not' //指定元素
});
-
+
//现将临时数据清理
admin.putTempData("t_tempProduct", "");
//待充值列表
@@ -401,6 +407,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_not").val() - listNum);
+ }
//待充值列表
var nowContract = function () {
table.render({
@@ -466,7 +485,7 @@
//已经充值的套餐
admin.putTempData("t_nowProduct", "");
res.data.forEach(element => {
- if(element.proType==1){
+ if (element.proType == 1) {
if (element.enabled) {
num += element.orderAilightCount;
} else {
@@ -475,6 +494,8 @@
}
});
$("#contractNum_not").val($("#contractNum").val() - num);
+ //将自定义的数量赋值
+ zidingyiNum();
}
});
}
@@ -492,34 +513,34 @@
}
}
//获取医院的地址
- var getHospitalAddress=function(id){
+ var getHospitalAddress = function (id) {
admin.req('api-user/syshospital/' + id, {},
function (data) {
- if(data.code==0){
- var hospitalData=data.data;
- var hospitalProvince=hospitalData.hospitalProvince!=null ? hospitalData.hospitalProvince: ""
- var hospitalCity=hospitalData.hospitalCity!=null ? hospitalData.hospitalCity: ""
- var hospitalArea=hospitalData.hospitalArea!=null ? hospitalData.hospitalArea: ""
- $("#hospitalAreas").val(hospitalProvince + " " + hospitalCity + " " +hospitalArea);
+ if (data.code == 0) {
+ var hospitalData = data.data;
+ var hospitalProvince = hospitalData.hospitalProvince != null ? hospitalData.hospitalProvince : ""
+ var hospitalCity = hospitalData.hospitalCity != null ? hospitalData.hospitalCity : ""
+ var hospitalArea = hospitalData.hospitalArea != null ? hospitalData.hospitalArea : ""
+ $("#hospitalAreas").val(hospitalProvince + " " + hospitalCity + " " + hospitalArea);
}
-
- },"get")
+
+ }, "get")
}
//限制自定义的时间
- function xianzhi(){
+ 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());
- }
+ 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());
}
- });
+ }
+ });
var custom_endTimes = laydate.render({
elem: '#custom_endTime', //指定元素
min: $("#contractBeginTime").val(),
@@ -546,11 +567,13 @@
}, "get")
}
+
//回显医院基本数据
let hospitalData = admin.getTempData('t_hospital');
if (hospitalData != null) {
nowContract();
+
admin.req('api-user/sysdepartment/getPayMes?departmentId=' + hospitalData.departmentId, {},
function (data) {
layer.closeAll('loading');
@@ -565,10 +588,14 @@
} else {
hospitalData.contractBeginTime = layui.util.toDateString(hospitalData.contractBeginTime, 'yyyy-MM-dd')
hospitalData.contractEndTime = layui.util.toDateString(hospitalData.contractEndTime, 'yyyy-MM-dd')
+ contractBeginTimeVVV = hospitalData.contractBeginTime
+ contractEndTimeVVV = hospitalData.contractEndTime
form.val('recharge-form', hospitalData);
+ $("#custom_beginTime").val(hospitalData.contractBeginTime)
+ $("#custom_endTime").val(hospitalData.contractEndTime)
//限制时间
xianzhi();
- getCycleTime();
+ getCycleTime(hospitalData.departmentId);
getHospitalAddress(hospitalData.hospitalId);
//装载产品数据
table.render({
@@ -694,7 +721,7 @@
var listNum = 0;
if (!strUtil.isEmpty(listData)) {
listData.forEach(item => {
- if(item.proType==1){
+ if (item.proType == 1) {
listNum += item.ailightCount;
}
})
@@ -719,8 +746,8 @@
custom_beginTime = $("#custom_beginTime").val();
custom_endTime = $("#custom_endTime").val();
} else {
- custom_beginTime = $("#contractBeginTime").val();
- custom_endTime = $("#contractEndTime").val();
+ custom_beginTime = contractBeginTimeVVV
+ custom_endTime = contractEndTimeVVV
}
var listData = admin.getTempData("t_tempProduct");
//添加一个id,删除用
@@ -799,6 +826,8 @@
if (!strUtil.isEmpty(obj.data.id)) {
delTempDataById(obj.data.id);
obj.del();
+ //将自定义的数量赋值
+ zidingyiNum();
}
}
});
@@ -840,19 +869,37 @@
data.isShare = obj.tr.find("td[data-field='isShare'] em").text();
data.isShare = (data.isShare.indexOf("不") == 0) ? 0 : 1;
//判断待加入产品的总数是否大于合同的总数
- //试用产品不计算总数
- if(data.proType==1){
- var msg = isthenNum(data.ailightCount);
- if (msg != null) {
- layer.msg(msg);
- return false;
- }
+ //试用产品不计算总数
+
+ if (data.proType == 1) {
+ var msg = isthenNum(parseInt(data.ailightCount));
+ if (msg != null) {
+ layer.msg(msg);
+ return false;
+ }
+ }
+ //将所选的时间不得大于 合同的时间
+ var contractBeginTime = $("#contractBeginTime").val();
+ var contractEndTime = $("#contractEndTime").val();
+ if (!strUtil.isEmpty(data.beginTime)) {
+ if (dateUtil.compareDate(contractBeginTime, data.beginTime)) {
+ layer.msg("开始时间必须大于合同的开始时间！");
+ return false;
+ }
+ }
+ if (!strUtil.isEmpty(data.endTime)) {
+ if (dateUtil.compareDate(data.endTime, contractEndTime)) {
+ layer.msg("结束时间必须小于合同的结束时间！");
+ return false;
+ }
}
if (!strUtil.isEmpty(data.beginTime) && !strUtil.isEmpty(data.endTime)) {
if (dateUtil.compareDate(data.endTime, data.beginTime)) {
data.id = data.id + '';
tempDataList(data);
waitRecharge();
+ //将自定义的数量赋值
+ zidingyiNum()
} else {
layer.msg("结束时间必须大于开始时间！");
return false;
@@ -863,6 +910,7 @@
}
}
});
+
// $("#contractNum_not").val($("#contractNum").val() - num);
function isthenNum(num) {
if (num <= 0) {
@@ -872,7 +920,7 @@
var listNum = 0;
if (!strUtil.isEmpty(listData)) {
listData.forEach(item => {
- if(item.proType==1){
+ if (item.proType == 1) {
listNum += item.ailightCount;
}
})
@@ -881,7 +929,7 @@
if ($("#contractNum_not").val() == undefined || $("#contractNum_not").val() == "") {
return "请输入合同读片充值量！";
} else {
- if ($("#contractNum_not").val() < listNum) {
+ if (parseInt($("#contractNum_not").val()) < listNum) {
return "当前产品总数不得大于合同读片充值量";
} else {
return null;
@@ -945,8 +993,22 @@
if (!isRun) {
layer.load(2);
var listData = admin.getTempData("t_tempProduct");
+ var len = listData != null && listData.length > 0 ? listData.length : 0;
+ var count= 0;
if (listData != null) {
- layer.confirm("确定要将待充值列表中的" + listData.length + "个产品充值给当前医院的科室吗？", {
+ listData.forEach(element => {
+ if (element.proType == 1) {
+ count += element.ailightCount;
+ }
+ });
+ }
+ if (count != $("#contractNum_not").val()) {
+ layer.closeAll('loading');
+ layer.msg("合同未充值量与套餐充值量不一致")
+ return false;
+ }
+ if (listData != null && listData.length > 0) {
+ layer.confirm("确定要将待充值列表中的" + len + "个产品充值给当前医院的科室吗？", {
btn: ["确定", "返回"]
}, function () {
isRun = true;
@@ -966,7 +1028,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,
};
@@ -997,6 +1059,9 @@
icon: 2,
time: 1000
});
+ layer.closeAll();
+ layer.closeAll('loading');
+ return false;
}
}, 'POST');
} else {
@@ -1012,6 +1077,8 @@
icon: 2,
time: 2000
});
+ layer.closeAll('loading');
+ return false;
}
layer.closeAll('loading');
return false;
--
Gitblit v1.8.0