From 644d37c99c6a4e910470f7fa4596c15d1b3e231c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 05 三月 2021 16:03:32 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/custOrder/custOrder.html                       |   77 ++++++++++++--------------------------
 src/main/java/zy/cloud/wms/common/utils/BarcodeUtils.java            |    2 
 src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java |    2 
 3 files changed, 26 insertions(+), 55 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/common/utils/BarcodeUtils.java b/src/main/java/zy/cloud/wms/common/utils/BarcodeUtils.java
index a948393..091d3da 100644
--- a/src/main/java/zy/cloud/wms/common/utils/BarcodeUtils.java
+++ b/src/main/java/zy/cloud/wms/common/utils/BarcodeUtils.java
@@ -18,7 +18,7 @@
  */
 public class BarcodeUtils {
 
-    private static final int DEFAULT_WIDTH = 110;
+    private static final int DEFAULT_WIDTH = 150;
     private static final int DEFAULT_HEIGHT = 40;
 
     /**
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index 35d0905..b142b3d 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -98,7 +98,7 @@
         vo.setDocNum(param.getNumber());
         vo.setList(pakouts);
         vo.setTotal(total);
-        vo.setCustName(custName);
+        vo.setCustName("娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�");
         vo.setWorkerName("闄嗘檽娑�");
         return R.ok().add(vo);
     }
diff --git a/src/main/webapp/views/custOrder/custOrder.html b/src/main/webapp/views/custOrder/custOrder.html
index e796201..7de315f 100644
--- a/src/main/webapp/views/custOrder/custOrder.html
+++ b/src/main/webapp/views/custOrder/custOrder.html
@@ -59,72 +59,43 @@
 <iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
 <div id="pakoutPrintBox" style="display: none"></div>
 
-
-<!--<div id="print-contain">-->
-<!--    &lt;!&ndash; 澶� &ndash;&gt;-->
-<!--    <div id="print-header">-->
-<!--        &lt;!&ndash; 宸� &ndash;&gt;-->
-<!--        <div style="float: left; width: 80%">-->
-<!--            <img class="template-code template-qrcode" src="{{data.barcodeUrl}}">-->
-<!--            <p>XSSDSSSS-qwewqewq</p>-->
-<!--        </div>-->
-<!--        &lt;!&ndash; 鍙� &ndash;&gt;-->
-<!--        <div style="float: left;width: 20%">-->
-<!--            <div>鎹¤揣鏁伴噺锛�<span>20</span></div>-->
-<!--        </div>-->
-<!--        <div style="float: left; width: 80%">-->
-<!--            瀹㈡埛锛�<span>娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</span>-->
-<!--        </div>-->
-<!--        <div style="float: left; width: 20%">-->
-<!--            鎹¤揣浜猴細闄嗘檽娑�-->
-<!--        </div>-->
-<!--    </div>-->
-<!--    <hr>-->
-<!--    &lt;!&ndash; 涓讳綋 &ndash;&gt;-->
-<!--    <div>-->
-<!--        <div class="pakout-item">-->
-<!--            <div class="item-header">-->
-<!--                {{maktx}}-->
-<!--            </div>-->
-<!--            <div class="item-content">-->
-<!--                <div style="float: left">{{anfme}}{{unit}}</div>-->
-<!--                <div style="float: right">璐т綅锛歿{locNo}}</div>-->
-<!--            </div>-->
-<!--        </div>-->
-<!--    </div>-->
-<!--</div>-->
 </body>
 
 <script type="text/template" id="pakoutPrintTpl">
     <!-- 澶� -->
     <div id="print-header">
-        <!-- 宸� -->
-        <div style="float: left; width: 80%">
-            <img class="template-code template-qrcode" src="{{data.barcodeUrl}}">
-            <p>{{data.docNum}}</p>
+        <div style="text-align: center">
+            <div style="text-align: center;margin-bottom: 10px">
+                <span style="font-family: 瀹嬩綋"> 鎹¤揣鍗� </span>
+            </div>
+
+            <img class="template-code template-qrcode" src="{{data.barcodeUrl}}" style="width: 80%">
+            <p style="letter-spacing: 2px;margin-top: 5px">{{data.docNum}}</p>
         </div>
-        <!-- 鍙� -->
-        <div style="float: left;width: 20%">
-            <div>鎹¤揣鏁伴噺锛�<span>{{data.total}}</span></div>
+        <div style="font-size: xx-small; text-align: left; margin-top: 10px">
+            <span style="font-family: 瀹嬩綋">瀹㈡埛锛歿{data.custName}}</span>
         </div>
-        <div style="float: left; width: 80%">
-            瀹㈡埛锛�<span>{{data.custName}}</span>
-        </div>
-        <div style="float: left; width: 20%">
-            鎹¤揣浜猴細{{data.workerName}}
+        <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>
+            </div>
+            <div style="float: left; width: 50%; text-align: right">
+                <span style="font-size: xx-small;font-family: 瀹嬩綋">鎹¤揣浜猴細{{data.workerName}}</span>
+
+            </div>
         </div>
     </div>
-    <hr>
+
     <!-- 涓讳綋 -->
-    <div>
+    <div style="margin-top: 100px">
         {{#each data.list}}
-        <div class="pakout-item">
-            <div class="item-header">
+        <div class="pakout-item" style="padding: 10px 5px 20px 5px;">
+            <div class="item-header" style="margin-top: 10px;font-family: 瀹嬩綋; font-size: x-small">
                 {{maktx}}
             </div>
-            <div class="item-content">
-                <div style="float: left">{{anfme}}{{unit}}</div>
-                <div style="float: right">璐т綅锛歿{locNo}}</div>
+            <div class="item-content" style="margin-top: 20px">
+                <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>
         </div>
         {{/each}}

--
Gitblit v1.9.1