From a56551a91812ec1f620d49c7e6e06f9f15eabdbb Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 12 Jan 2021 17:39:29 +0800
Subject: [PATCH] 1、修改服务单看板时间查询了未确认的和已取消的bug 2、跟进记录根据时间倒序排序

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html
index d36bf8a..13f7806 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html
@@ -11,6 +11,7 @@
 	<!-- 本框架基本脚本和样式 -->
 	<script type="text/javascript" th:src="@{/js/systools/MBaseVue.js}"></script>
 	<link rel="stylesheet" th:href="@{/plugin/element-ui/index.css}">
+	<script type="text/javascript" th:src="@{/plugin/moment.min.js}"></script>
 	<link th:href="@{/css/styleOne/style.min.css}" rel="stylesheet" type="text/css"/>
 
 	<!-- 富文本编辑器 -->
@@ -177,6 +178,7 @@
 					<el-date-picker
 							v-model="yyTime"
 							type="date"
+							value-format="yyyy-MM-dd HH:mm"
 							placeholder="选择预约时间">
 					</el-date-picker>
 

--
Gitblit v1.9.1