From f5df017deac69032a31b6f637c3ce80cd1c414cb Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 03 Mar 2021 10:42:10 +0800
Subject: [PATCH] 将查看套餐的开始时间和结束时间与h端对应
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html | 49 +++++++++++++++++++++++++++++--------------------
1 files changed, 29 insertions(+), 20 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 cb8cf26..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,11 +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%;" />
+ 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;display: inline-block;width: 46%;" />
+ style="border: none; margin-top:-10px;margin-left: 10%;display: inline-block;width: 30%;" />
</div>
</div>
<div class="layui-col-sm3">
@@ -228,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>
@@ -407,18 +407,18 @@
]
});
}
- //将自定义的数量重新赋值
- function zidingyiNum(){
+ //将自定义的数量重新赋值
+ function zidingyiNum() {
var listData = admin.getTempData("t_tempProduct");
var listNum = 0;
if (!strUtil.isEmpty(listData)) {
listData.forEach(item => {
- if(item.proType==1){
+ if (item.proType == 1) {
listNum += item.ailightCount;
}
})
}
- $("#custom_ailightCount").val($("#contractNum_not").val()-listNum);
+ $("#custom_ailightCount").val($("#contractNum_not").val() - listNum);
}
//待充值列表
var nowContract = function () {
@@ -494,7 +494,7 @@
}
});
$("#contractNum_not").val($("#contractNum").val() - num);
- //将自定义的数量赋值
+ //将自定义的数量赋值
zidingyiNum();
}
});
@@ -566,14 +566,14 @@
}, "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');
@@ -881,16 +881,14 @@
//将所选的时间不得大于 合同的时间
var contractBeginTime = $("#contractBeginTime").val();
var contractEndTime = $("#contractEndTime").val();
- if (!strUtil.isEmpty(data.beginTime)){
- if (dateUtil.compareDate( contractBeginTime,data.beginTime)) {
+ if (!strUtil.isEmpty(data.beginTime)) {
+ if (dateUtil.compareDate(contractBeginTime, data.beginTime)) {
layer.msg("开始时间必须大于合同的开始时间！");
return false;
}
}
- if (!strUtil.isEmpty(data.endTime)){
- console.log(contractEndTime,"contractEndTime")
- console.log(data.endTime,"data.endTimedata.endTime")
- if (dateUtil.compareDate(data.endTime,contractEndTime)) {
+ if (!strUtil.isEmpty(data.endTime)) {
+ if (dateUtil.compareDate(data.endTime, contractEndTime)) {
layer.msg("结束时间必须小于合同的结束时间！");
return false;
}
@@ -912,7 +910,7 @@
}
}
});
-
+
// $("#contractNum_not").val($("#contractNum").val() - num);
function isthenNum(num) {
if (num <= 0) {
@@ -995,10 +993,21 @@
if (!isRun) {
layer.load(2);
var listData = admin.getTempData("t_tempProduct");
- // debugger
var len = listData != null && listData.length > 0 ? listData.length : 0;
- // debugger
+ var count= 0;
if (listData != null) {
+ 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 () {
--
Gitblit v1.8.0