From d6c989a5d9122e5cf969dd640a92b8e12caf8aa6 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Thu, 22 Apr 2021 11:18:28 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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 b1d5ccd..03bc8bf 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">
@@ -420,12 +420,13 @@
}
$("#custom_ailightCount").val($("#contractNum_not").val() - listNum);
}
- //待充值列表
+ //已充值列表
var nowContract = function () {
table.render({
elem: '#product-table-now',
data: admin.getTempData("t_tempProduct"),
- page: false,
+ page: 1,
+ limit: 50,
url: config.base_server + 'api-opration/productorderdetail?orderId=' + admin.getTempData('t_hospital').id,
cellMinWidth: 100,
headers: {
@@ -888,8 +889,6 @@
}
}
if (!strUtil.isEmpty(data.endTime)) {
- console.log(contractEndTime, "contractEndTime")
- console.log(data.endTime, "data.endTimedata.endTime")
if (dateUtil.compareDate(data.endTime, contractEndTime)) {
layer.msg("结束时间必须小于合同的结束时间！");
return false;
--
Gitblit v1.8.0