From a98d9e4bb62ba83bfdd6e2d9308ef6a25beb2ef0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 25 Oct 2021 11:36:16 +0800
Subject: [PATCH] 20211025
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form.html | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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..90f4acc 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">
@@ -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]
});
}
--
Gitblit v1.9.1