1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0...

jyy

2021-07-17 ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8

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

@@ -112,15 +112,18 @@
                                <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>
@@ -156,9 +159,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"
@@ -451,12 +451,12 @@
                });
            }
            ,
            getFreedBeautyd: function (index) {
            getFreedBeautyd: function () {
                console.log("获取美疗师");
                let _this = this;
                let projService = _this.projService;
                let beStates = projService.serviceItems[index];

                let beStates = projService.serviceItems[0];
                console.log(beStates);
                if (beStates == null ||  MTools.isBlank(beStates.beginTimeForm) ||    MTools.isBlank(beStates.endTimeForm )  ){
                    return;
                }