Merge branch 'developer' into alpha

Helius

2022-03-14 b5960ac13f8d67c0baf8f23ffb2e24de1494cbf7

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

@@ -76,17 +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="200">
                                width="100">
                        </el-table-column>
                        <el-table-column
                                prop="count"
                                label="次数"
                                width="200">
                                width="100">
                        </el-table-column>
                        <el-table-column
                                prop="projInfo.timeLength"
@@ -165,18 +170,16 @@
                    title: "打印服务单",
                    area: ['250px', '550px'],
                    maxmin: true,
                    content: [basePath + '/admin/redirect/hive/beautySalon/print-service?id=' + id]
                    content: [basePath + '/admin/projService/printOrder?id=' + id]
                });
            },
            toBack() {
                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;
@@ -196,7 +199,7 @@
            title: "打印服务单",
            area: ['250px', '550px'],
            maxmin: true,
            content: [basePath + '/admin/redirect/hive/beautySalon/print-service?id=' + id]
            content: [basePath + '/admin/projService/printOrder?id=' + id]
        });
    }