Merge branch 'ty_urgent' into test

Helius

2020-12-19 a9bb3348487c4a75c6a74a4d84f3a8afe9858d0c

 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>

@@ -261,7 +263,7 @@
            }
             let formData={
                vipId:id,
                yyTime:_this.yyTime,
                yyTime:moment(_this.yyTime).format("YYYY-DD-MM HH:mm"),
                serviceItems:[],
             }