From 7c92603d6548e7405a298d3c4996942acd999376 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Wed, 14 Jul 2021 17:35:30 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/serviceOrderDetail.html | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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..1e77049 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
--
Gitblit v1.9.1