From 90f2acaa6c61d5a60822d4fee5a44ec3c5404f67 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Wed, 31 Mar 2021 18:52:02 +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/contract.html | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 97d29b7..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
@@ -147,7 +147,6 @@
});
var showModel = function (data) {
- console.log(data)
layer.open({
type: 1,
title: '查看产品',
@@ -182,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: '创建时间' }
--
Gitblit v1.8.0