~jiangyouyao/beauty-erp.git

			@@ -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"/>

			<!-- 富文本编辑器 -->
			@@ -125,7 +126,8 @@
			<el-tab-pane label="套餐" name="tab2">
			<template v-for="item in taocanList" >
			<p class="el-big-title">【{{item.isCourse=='N'?'固定套餐':'任选套餐'}}】{{item.projName}}
			<code v-if="item.projInfo.isCourse=='Y'" > 剩余次数：{{item.surplusCount}} </code>
			<span style="float: right" v-if="item.failTime != null">有效期:{{item.failTime}}</span>
			<code v-if="item.projInfo.isCourse=='Y'" > 剩余次数：<span v-if="item.projInfo.isInfinite == 'Y'">无限次</span><span v-else>{{item.surplusCount}}</span> </code>
			</p>
			<el-table
			:data="item.taocanProjUse"
			@@ -143,10 +145,10 @@
			prop="surplusCount"
			label="余次">
			</el-table-column>
			<el-table-column
			prop="failTimeStr"
			label="有效期">
			</el-table-column>
			<!-- <el-table-column-->
			<!-- prop="failTimeStr"-->
			<!-- label="有效期">-->
			<!-- </el-table-column>-->
			<el-table-column
			prop="source"
			label="来源">
			@@ -176,6 +178,7 @@
			<el-date-picker
			v-model="yyTime"
			type="date"
			value-format="yyyy-MM-dd HH:mm"
			placeholder="选择预约时间">
			</el-date-picker>