From fbf6a877aae46e19a8d3c0058cefa3f81c72715f Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 27 Nov 2020 18:31:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html | 5 ++++-
1 files changed, 4 insertions(+), 1 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 8613f39..407b48d 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
@@ -24,7 +24,7 @@
<!-- 表格操作列 -->
<script type="text/html" id="contract-table-bar">
<!-- <a class="layui-btn layui-btn-danger layui-btn-xs permissions" permissions="contract-del" lay-event="del">删除</a> -->
-<a class="layui-btn layui-btn-xs permissions" permissions="contract-edit" lay-event="edit"">修改</a>
+<a class="layui-btn layui-btn-xs permissions" permissions="contract-edit" lay-event="edit">修改</a>
<a class=" layui-btn layui-btn-primary layui-btn-xs permissions" permissions="productorderdetail-save"
lay-event="detail">查看套餐</a>
</script>
@@ -85,6 +85,9 @@
},
{
field: 'contractTime', width: 120, title: '合同签订时间', templet: function (d) {
+ if(d.contractTime==null){
+ return new Date(d.createTime).dateFormat("yyyy/MM/dd");
+ }
return new Date(d.contractTime).dateFormat("yyyy/MM/dd");
}
},
--
Gitblit v1.8.0