From 2a7a159b136805612e241e4e8e24affedfc23cc2 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 20 Nov 2021 21:07:43 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/serviceOrderDetail.html | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/serviceOrderDetail.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/serviceOrderDetail.html
index 64b1195..82b63d7 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/serviceOrderDetail.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/serviceOrderDetail.html
@@ -73,7 +73,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="100">
+ </el-table-column>
+ <el-table-column
+ prop="count"
+ label="次数"
+ width="100">
</el-table-column>
<el-table-column
prop="projInfo.timeLength"
@@ -81,7 +96,6 @@
width="200">
</el-table-column>
<el-table-column
- prop="address"
label="服务时间" :formatter="serviceTime">
</el-table-column>
<el-table-column
@@ -166,7 +180,7 @@
title: "打印服务单",
area: ['250px', '550px'],
maxmin: true,
- content: [basePath + '/admin/redirect/hive/beautySalon/print-service?id=' + id]
+ content: [basePath + '/admin/projService/printOrder?id=' + id]
});
},
toBack() {
@@ -191,7 +205,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