From fa791f7796c1546b1329b52a3de8d753915cb4d5 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:24:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form.html | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form.html
index f76a2a6..05fd426 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form.html
@@ -79,6 +79,11 @@
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">
@@ -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;
--
Gitblit v1.9.1