From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form.html |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 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 59504c6..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
@@ -76,17 +76,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="200">
+                                width="100">
                         </el-table-column>
                         <el-table-column
                                 prop="count"
                                 label="次数"
-                                width="200">
+                                width="100">
                         </el-table-column>
                         <el-table-column
                                 prop="projInfo.timeLength"
@@ -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