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/hospital.html | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
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..27ae8b8 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
@@ -26,7 +26,7 @@
<option value="1">-已开通-</option>
<option value="0">-未开通-</option>
</select>
- <input id="hosName" class="layui-input search-input" type="text" placeholder="按医院名" />
+ <input id="hosName" class="layui-input search-input" type="text" autocomplete="off" placeholder="按医院名" />
<button id="hospita-btn-search" class="layui-btn icon-btn"><i class="layui-icon permissions"
permissions="hospital-get"></i>搜索</button> 
<button id="hospital-btn-add" class="layui-btn icon-btn"><i class="layui-icon permissions"
@@ -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