From 75f1c8f7380994e032de7d32ca7890dff543aaa2 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 21 Jul 2021 10:19:15 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

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

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html
index 93b3a8e..a01f2d8 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html
@@ -112,14 +112,19 @@
                                 <table class="table table-bordered">
                                     <tr>
                                         <th>项目名称</th>
+                                        <th>次数</th>
+                                        <th>划扣金额</th>
                                         <th width="100px">服务时长(分钟)</th>
                                         <th>服务时间</th>
                                         <th width="300px">美疗师</th>
+                                        <th style="width: 100px;">提成</th>
                                         <th>操作</th>
                                     </tr>
 
                                     <tr v-for="(item,index) in projService.serviceItems">
                                         <td>{{item.projInfo.name}}</td>
+                                        <td>{{item.count}}</td>
+                                        <td>{{item.projUse.price * item.count}}</td>
                                         <td><el-input @change="changeTimeLength" v-model="item.projInfo.timeLength"></el-input></td>
 
                                         <td>
@@ -157,6 +162,9 @@
                                             </el-select>
                                         </td>
                                         <td>
+                                            <el-input v-model="item.extract"></el-input>
+                                        </td>
+                                        <td>
                                             <el-button size="mini" type="danger"
                                                     @click="handleDelete(index)">删除</el-button>
                                         </td>

--
Gitblit v1.9.1