From 31de20695ac5fc8562c5922fcbe8729ae4e146a1 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 29 Jun 2020 14:20:39 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html | 7 +++++--
1 files changed, 5 insertions(+), 2 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 2d9e63c..25ec7f9 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
@@ -387,6 +387,9 @@
if (listData != null) {
if (data.field != null) {
layer.confirm("确定要将待充值列表中的" + listData.length + "个产品充值给当前医院吗？", { btn: ["确定", "返回"] }, function () {
+ data.field.contractBeginTime=data.field.contractBeginTime+" 00:00:00";
+ data.field.contractEndTime=data.field.contractEndTime+" 23:59:59";
+ data.field.contractTime=data.field.contractTime+" 00:00:00";
admin.req('api-opration/contract', JSON.stringify(data.field), function (data) {
layer.closeAll('loading');
if (data.code === 0) {
@@ -402,8 +405,8 @@
isShare: item.isShare,
ailightCount: item.ailightCount,
recordCount: item.recordCount,
- proBegintime: new Date(item.beginTime + ' 00:00:00'),
- proEndtime: new Date(item.endTime + ' 23:59:59')
+ proBegintime: item.beginTime + ' 00:00:00',
+ proEndtime: item.endTime + ' 23:59:59'
};
listDetailData.push(detailData);
})
--
Gitblit v1.8.0