From c2cd7bc6d350d00f4e5df6d114f68f0804cb13d1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 11 三月 2021 17:03:51 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/custOrder/custOrder.html |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/views/custOrder/custOrder.html b/src/main/webapp/views/custOrder/custOrder.html
index 7de315f..318fe15 100644
--- a/src/main/webapp/views/custOrder/custOrder.html
+++ b/src/main/webapp/views/custOrder/custOrder.html
@@ -33,6 +33,7 @@
 </div>
 <script type="text/html" id="toolbar">
     <div class="layui-btn-container">
+        <button class="layui-btn" onclick="right()">鑷畾涔夐攢鍞崟</button>
 <!--        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
         <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
         <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
@@ -41,7 +42,7 @@
 
 <script type="text/html" id="operate">
     {{#if (d.status == 1){ }}
-        <a class="layui-btn layui-btn-sm layui-btn-danger" lay-event="stockOut" style="font-size: 16px">鎹¤揣</a>
+        <a class="layui-btn layui-btn-sm layui-btn-danger" lay-event="stockOut" style="font-size: 16px">鎷h揣</a>
     {{# } }}
     {{#if (d.status == 2){ }}
         <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="print" style="font-size: 16px">鎵撳嵃</a>
@@ -63,10 +64,10 @@
 
 <script type="text/template" id="pakoutPrintTpl">
     <!-- 澶� -->
-    <div id="print-header">
+    <div id="print-header" style="margin: 20px 0">
         <div style="text-align: center">
             <div style="text-align: center;margin-bottom: 10px">
-                <span style="font-family: 瀹嬩綋"> 鎹¤揣鍗� </span>
+                <span style="font-family: 瀹嬩綋"> 鎷h揣鍗� </span>
             </div>
 
             <img class="template-code template-qrcode" src="{{data.barcodeUrl}}" style="width: 80%">
@@ -77,25 +78,26 @@
         </div>
         <div style="margin-top: 10px">
             <div style="float: left;width: 50%; text-align: left">
-                <span style="font-size: xx-small;font-family: 瀹嬩綋">鎹¤揣鏁伴噺锛歿{data.total}}</span>
+                <span style="font-size: xx-small;font-family: 瀹嬩綋">鎷h揣鏁伴噺锛歿{data.total}}</span>
             </div>
             <div style="float: left; width: 50%; text-align: right">
-                <span style="font-size: xx-small;font-family: 瀹嬩綋">鎹¤揣浜猴細{{data.workerName}}</span>
-
+                <span style="font-size: xx-small;font-family: 瀹嬩綋">鎷h揣浜猴細{{data.workerName}}</span>
             </div>
+            <div style="clear:both;"></div>
         </div>
     </div>
 
     <!-- 涓讳綋 -->
-    <div style="margin-top: 100px">
+    <div style="margin-top: 10px">
         {{#each data.list}}
-        <div class="pakout-item" style="padding: 10px 5px 20px 5px;">
+        <div class="pakout-item" style="padding: 10px 5px 10px 5px;border-top: 1px solid #525252">
             <div class="item-header" style="margin-top: 10px;font-family: 瀹嬩綋; font-size: x-small">
                 {{maktx}}
             </div>
-            <div class="item-content" style="margin-top: 20px">
+            <div class="item-content" style="margin: 10px 0 ">
                 <div style="float: left;font-family: 瀹嬩綋; font-size: xx-small">{{anfme}}{{unit}}</div>
                 <div style="float: right;font-family: 瀹嬩綋; font-size: xx-small">璐т綅锛歿{locNo}}</div>
+                <div style="clear: both;"></div>
             </div>
         </div>
         {{/each}}

--
Gitblit v1.9.1