From c49b95fc3576f9a5dad5bcaa6874157d5091f6e0 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Thu, 27 Aug 2020 09:19:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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 209a50f..697168d 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
@@ -1,5 +1,6 @@
<form id="recharge-form" lay-filter="recharge-form" class="layui-form">
- <div class="layui-tab" style="margin-top: 5px;">
+ <div style="overflow-y: auto; height:700px;">
+ <div class="layui-tab">
<ul class="layui-tab-title">
<li class="layui-this">合同信息</li>
</ul>
@@ -67,7 +68,7 @@
<label class="layui-form-label">合同编号</label>
<div class="layui-input-block">
<input name="contractNo" id="contractNo" type="text" class="layui-input" maxlength="50"
- style="width: 185px;" autocomplete="off" />
+ style="width: 185px;" autocomplete="off" lay-verify="required" required />
</div>
</div>
</div>
@@ -122,6 +123,7 @@
</div>
</div>
</div>
+ </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-filter="recharge-form-submit"
@@ -155,6 +157,8 @@
var $ = layui.jquery;
var laydate = layui.laydate;
+ //充值进行中
+ var isRun=false;
//执行一个laydate实例
laydate.render({
elem: '#contractBeginTime' //指定元素
@@ -174,7 +178,7 @@
elem: '#product-table-temp',
data: admin.getTempData("t_tempProduct"),
page: false,
- height: '120px',
+ cellMinWidth: 100,
cols: [
[{
field: 'proName',
@@ -276,12 +280,13 @@
elem: '#product-table',
url: config.base_server + 'api-opration/product',
method: 'GET',
+ cellMinWidth: 50,
headers: {
'Authorization': 'Bearer ' + config.getToken().access_token
},
page: false,
- height: '300px',
where: {
+ is_del: 0,
enabled: 1
},
cols: [
@@ -486,13 +491,15 @@
}
}
form.on('submit(recharge-form-submit)', function (data) {
- layer.load(2);
+ if(!isRun){
+ layer.load(2);
var listData = admin.getTempData("t_tempProduct");
if (listData != null) {
if (data.field != null) {
- layer.confirm("确定要将待充值列表中的" + listData.length + "个产品充值给当前医院吗？", {
+ layer.confirm("确定要将待充值列表中的" + listData.length + "个产品充值给当前医院的科室吗？", {
btn: ["确定", "返回"]
}, function () {
+ isRun=true;
data.field.contractBeginTime = data.field.contractBeginTime +
" 00:00:00";
data.field.contractEndTime = data.field.contractEndTime + " 23:59:59";
@@ -526,6 +533,7 @@
admin.req('api-opration/productorderdetail/saveall',
JSON.stringify(listDetailData),
function (data) {
+ isRun=false;
layer.closeAll('loading');
if (data.code === 0) {
//现将临时数据清理
@@ -550,12 +558,14 @@
icon: 2,
time: 1000
});
+ isRun=false;
}
} else {
layer.msg(data.msg, {
icon: 2,
time: 1000
});
+ isRun=false;
}
}, 'POST');
})
@@ -573,6 +583,7 @@
}
layer.closeAll('loading');
return false;
+ }
});
});
</script>
\ No newline at end of file
--
Gitblit v1.8.0