Merge branch 'score_shop' into api_score_meger

jyy

2021-06-19 e522e4d40451b4e46ec79b3d8a3891899196f14f

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

@@ -38,7 +38,10 @@
                    <i class="el-icon-s-order" type="primary"></i>
                </el-col>
                <el-col :span="10">
                    <h1 style="line-height: 60px; margin: 0 0;">服务单号：{{serviceOrderInfo.serviceNo}}</h1>
                    <h1 style="line-height: 60px; margin: 0 0;display: inline-block">服务单号：{{serviceOrderInfo.serviceNo}}</h1>
                </el-col>
                <el-col :span="5">
                    <h1 style="line-height: 60px; margin: 0 0;display: inline-block"><span style="color: #cf2d27;float: right ">￥{{serviceOrderInfo.money}}</span></h1>
                </el-col>
                <el-col :span="5" style="float: right; margin-right: 10px;">
                    <el-button type="info" @click="printf">打印</el-button>
@@ -60,7 +63,7 @@
                    <p>预约时间：{{dateFormat(serviceOrderInfo.yyTime)}}</p>
                </el-col>
                <el-col :span="3">
                    <p>配料师：{{pylFormat()}}</p>
                    <p>配料师：{{serviceOrderInfo.plsName}}</p>
                    <p>备注：{{serviceOrderInfo.remark}}</p>
                </el-col>
            </el-row>
@@ -73,7 +76,22 @@
                        <el-table-column
                                prop="projInfo.name"
                                label="商品名称"
                                width="280">
                                width="400">
                        </el-table-column>
                        <el-table-column
                                prop="projUse.source"
                                label="来源"
                                width="400">
                        </el-table-column>
                        <el-table-column
                                :formatter="hkPrice"
                                label="划扣金额"
                                width="100">
                        </el-table-column>
                        <el-table-column
                                prop="count"
                                label="次数"
                                width="100">
                        </el-table-column>
                        <el-table-column
                                prop="projInfo.timeLength"
@@ -144,20 +162,7 @@
                    }
                }
            },
            pylFormat() {
                if (!this.plsList) {
                    return;
                }

                var plsList = this.plsList;
                var doctorId = this.serviceOrderInfo.doctorId;

                for(var i = 0; i < plsList.length; i++) {
                    if (plsList[i].id = doctorId) {
                        return plsList[i].staffName;
                    }
                }
            },
            printf() {
                var id = this.serviceOrderInfo.id;
                layer.open({
@@ -172,14 +177,16 @@
                MTools.closeForm();
            },
            serviceTime(row, column) {
                console.log(column);
                console.log(row);
                // if (!column.bedState) {
                //     return "-";
                // }
                  if (!row.beginTime) {
                     return "-";
                 }
                var startTime = this.dateFormat(row.beginTime);
                var endTime = this.dateFormat(row.endTime);
                return startTime + " - " + endTime;
            },
            hkPrice(row, column) {
                console.log(row);
                return row.projUse.price *  row.count ;
            }
        },
    });