fix ty urgent bugs

Helius

2020-12-15 2914588a65371a3ce43f678cde0a26cd8da26611

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html

@@ -125,7 +125,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 +144,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="来源">