Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-07-15 269985404f94b50d14099b83f3436d6d405c365d

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

@@ -112,15 +112,16 @@
                                <table class="table table-bordered">
                                    <tr>
                                        <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><el-input @change="changeTimeLength" v-model="item.projInfo.timeLength"></el-input></td>

                                        <td>
@@ -156,9 +157,6 @@
                                                        :value="item.suId">
                                                </el-option>
                                            </el-select>
                                        </td>
                                        <td>
                                            <el-input v-model="item.extract"></el-input>
                                        </td>
                                        <td>
                                            <el-button size="mini" type="danger"