Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-03-15 a6390619c7ce74611659ba091047f9278a8404a9

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

@@ -48,7 +48,8 @@
                            </div>
                            <label class="col-md-1 control-label">服务时长</label>
                            <div class="col-md-3">
                                <el-input @change="changeYyTime()" v-model="projService.totalTime"></el-input>
<!--                                <el-input @change="changeYyTime()" v-model="projService.totalTime"></el-input>-->
                                <label class="control-label">{{projService.totalTime}}</label>
                            </div>
                        </div>
                        <div class="form-group">
@@ -105,7 +106,7 @@
                                <table class="table table-bordered">
                                    <tr>
                                        <th>项目名称</th>
                                        <th width="50px">服务时长</th>
                                        <th width="100px">服务时长(分钟)</th>
                                        <th>服务时间</th>
                                        <th width="300px">美疗师</th>
                                        <th style="width: 100px;">提成</th>
@@ -113,7 +114,7 @@

                                    <tr v-for="(item,index) in projService.serviceItems">
                                        <td>{{item.projInfo.name}}</td>
                                        <td>{{item.projInfo.timeLength}}(分钟)</td>
                                        <td><el-input @change="changeTimeLength" v-model="item.projInfo.timeLength"></el-input></td>

                                        <td>
                                            <div style="display: flex;">
@@ -323,6 +324,7 @@
                        endTime: endTime,
                        staffId: beStates.staffId,
                        extract: beStates.extract,
                        excTime : beStates.projInfo.timeLength,
                        id: beStates.id,
                    });

@@ -465,9 +467,17 @@
                });


            }
            ,
            },
            changeTimeLength:function() {
                let _this = this;

                var totalTime = 0;
                _this.projService.serviceItems.forEach(item => {
                    totalTime += parseInt(item.projInfo.timeLength);
                });
                _this.projService.totalTime = totalTime;
                _this.changeYyTime();
            }

        },
        filters: