From d8f4de646a7cf7b6a9952775f33ebabeb468167d Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 17:05:01 +0800
Subject: [PATCH] 1、门店服务单限制

---
 zq-erp/src/main/resources/templates/views/admin/hive-erp/order/serviceOrderDetail.html |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 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 3dafa6f..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
@@ -48,7 +48,7 @@
             </el-row>
             <el-row class="order-info" type="flex" justify="space-around"  style="height: 150px; padding: 30px 30px;">
                 <el-col :span="5">
-                    <p>会员姓名:{{serviceOrderInfo.vipInfo.staffName}}</p>
+                    <p>会员姓名:{{serviceOrderInfo.vipInfo.vipName}}</p>
                     <p>会员电话:{{serviceOrderInfo.vipInfo.phone}}</p>
                 </el-col>
                 <el-col :span="5">
@@ -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