Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-04-14 95f9ea7eb339c36cade6c67d0385c49ec2d81477

 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"
@@ -172,11 +177,9 @@
                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;