From 1ceabefb451912daa5dda7768b7ef0b89a56c08a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 25 Mar 2022 12:28:00 +0800
Subject: [PATCH] 1

---
 zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/print-service-meidu.html |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/print-service-meidu.html b/zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/print-service-meidu.html
index b7c3ca2..62f8f07 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/print-service-meidu.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/print-service-meidu.html
@@ -30,7 +30,7 @@
         <h1   style="text-align: center;font-size:18px;margin: 20px auto;">
             {{projService.shopName}}
         </h1>
-        <table style="width: 100%; font-size:10px;line-height: 20px;">
+        <table style="width: 100%; font-size:10px;">
 
             <tr>
                 <td colspan="2">
@@ -53,7 +53,7 @@
                 </td>
             </tr>
         </table>
-        <table style="width: 80%;font-size:10px;margin-top: 20px;text-align: left">
+        <table style="width: 80%;font-size:10px;margin-top: 10px;text-align: left; margin-bottom: 5px;">
             <tr>
                 <th style="text-align: left;"  colspan="4">产品</th>
             </tr>
@@ -65,17 +65,17 @@
             </tr>
             <template v-for="item in projService.serviceItems">
                 <tr  >
-                    <td style="text-align: left;" colspan="4" >{{item.projInfo.name }}</td>
+                    <td style="text-align: left;" colspan="4" >{{item.projInfo.name }}【{{item.projUse.source}}】</td>
                 </tr>
                 <tr  >
                     <td>{{item.count }}</td>
                     <td>{{item.projUse.price }}</td>
-                    <td >{{item.projUse.surplusCount }}</td>
+                    <td >{{item.projUse.remainCount == null ? "-" : item.projUse.remainCount}}</td>
                     <td>{{item.beautiStaffInfo?item.beautiStaffInfo.suName:''}}</td>
                 </tr>
             </template>
         </table>
-        <table style="width: 100%;font-size: 10px;line-height: 30px;">
+        <table style="width: 100%;font-size: 10px; margin-bottom: 5px;">
             <tr>
                 <td>
                     <b>本次划扣:</b> <span >{{projService.money}}</span>

--
Gitblit v1.9.1