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/contract.html | 8 ++++++--
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html | 9 ++++++---
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
index 7a650b2..3dca191 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
@@ -181,12 +181,16 @@
},
{
field: 'proBegintime', width: 150, title: '开始时间', templet: function (d) {
- return new Date(d.proBegintime).dateFormat("yyyy/MM/dd");
+ return new Date(d.proBegintime).dateFormat("yyyy/MM/dd hh:mm:ss");
}
},
{
field: 'proEndtime', width: 180, title: '结束时间', templet: function (d) {
- return new Date(d.proEndtime).dateFormat("yyyy/MM/dd");
+ var dateTime=new Date(d.proEndtime);
+ dateTime=dateTime.setDate(dateTime.getDate()-1);
+ dateTime=new Date(dateTime);
+ return dateTime
+ .dateFormat("yyyy/MM/dd")+" 24:00:00";
}
},
{ field: 'createTime', width: 160, sort: true, title: '创建时间' }
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
index e8dd898..134f2bb 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
@@ -400,7 +400,7 @@
title: '开始时间',
templet: function (d) {
return new Date(d.proBegintime)
- .dateFormat("yyyy/MM/dd");
+ .dateFormat("yyyy/MM/dd hh:mm:ss");
}
},
{
@@ -408,8 +408,11 @@
width: 180,
title: '结束时间',
templet: function (d) {
- return new Date(d.proEndtime)
- .dateFormat("yyyy/MM/dd");
+ var dateTime=new Date(d.proEndtime);
+ dateTime=dateTime.setDate(dateTime.getDate()-1);
+ dateTime=new Date(dateTime);
+ return dateTime
+ .dateFormat("yyyy/MM/dd")+" 24:00:00";
}
},
{
--
Gitblit v1.8.0