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

jyy

2021-01-19 0a67d6a24417507a27e03d53da82bbd802257148

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

@@ -48,7 +48,7 @@
            </el-row>
            <el-row class="order-info" type="flex" justify="space-around"  style="height: 150px; padding: 30px 30px;">
                <el-col :span="5">
                    <p>会员姓名：{{serviceOrderInfo.vipInfo.staffName}}</p>
                    <p>会员姓名：{{serviceOrderInfo.vipInfo.vipName}}</p>
                    <p>会员电话：{{serviceOrderInfo.vipInfo.phone}}</p>
                </el-col>
                <el-col :span="5">
@@ -81,7 +81,6 @@
                                width="200">
                        </el-table-column>
                        <el-table-column
                                prop="address"
                                label="服务时间" :formatter="serviceTime">
                        </el-table-column>
                        <el-table-column
@@ -173,11 +172,13 @@
                MTools.closeForm();
            },
            serviceTime(row, column) {
                if (!column.bedState) {
                    return "-";
                }
                var startTime = moment(column.bedState.startTime).format("YYYY-MM-DD HH:mm");
                var endTime = moment(column.bedState.endTime).format("YYYY-MM-DD HH:mm");
                console.log(column);
                console.log(row);
                // if (!column.bedState) {
                //     return "-";
                // }
                var startTime = this.dateFormat(row.beginTime);
                var endTime = this.dateFormat(row.endTime);
                return startTime + "-" + endTime;
            }
        },