From a0b733a8b19b1db43395a96408098596ac3d2a86 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期二, 05 十二月 2023 08:16:06 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/order/order.html |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 4b6e9a5..23b97cb 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -109,13 +109,17 @@
     </div>
 </div>
 
+<script type="text/html" id="docTypeTpl">
+    <span name="docType" class="layui-badge layui-badge-gray">{{d.docType$}}</span>
+</script>
+
 <script type="text/html" id="operate">
     {{#if (d.settle == 1){ }}
     <a class="layui-btn layui-btn-sm layui-btn-danger" lay-event="stockOut" style="font-size: 16px">鎷h揣鍗�</a>
     {{# } }}
-    {{#if (d.settle == 2 || d.settle == 4){ }}
+<!--    {{#if (d.settle == 2 || d.settle == 4){ }}-->
     <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="print" style="font-size: 16px">鎵撳嵃</a>
-    {{# } }}
+<!--    {{# } }}-->
 </script>
 
 <script type="text/html" id="settleTpl">
@@ -128,6 +132,8 @@
           class="layui-badge layui-badge-gray"
           {{# } else if(d.settle === 4){ }}
           class="layui-badge layui-badge-green"
+          {{# } else { }}
+          class="layui-badge layui-badge-gray"
           {{# } }}
     >{{d.settle$}}</span>
 </script>
@@ -203,8 +209,8 @@
 </body>
 <script type="text/template" id="pakoutPrintTpl">
     <!-- 澶� -->
-    <div id="print-header" style="margin: 20px 0">
-        <div style="text-align: center">
+    <div id="print-header" style="margin: 20px 0; ">
+        <div style="text-align: center; font-size: x-large">
             <div style="text-align: center;margin-bottom: 10px">
                 <span style="font-family: 瀹嬩綋"> 鎷h揣鍗� </span>
             </div>
@@ -212,15 +218,15 @@
             <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="font-size: xx-small; text-align: left; margin-top: 10px">
+        <div style="font-size: x-large; text-align: left; margin-top: 10px">
             <span style="font-family: 瀹嬩綋">瀹㈡埛锛歿{data.cstmrName}}</span>
         </div>
         <div style="margin-top: 10px">
             <div style="float: left;width: 50%; text-align: left">
-                <span style="font-size: xx-small;font-family: 瀹嬩綋">鎷h揣鏁伴噺锛歿{data.total}}</span>
+                <span style="font-size: x-large;font-family: 瀹嬩綋">鎷h揣鏁伴噺锛歿{data.total}}</span>
             </div>
             <div style="float: left; width: 50%; text-align: right">
-                <span style="font-size: xx-small;font-family: 瀹嬩綋">鎷h揣浜猴細{{data.workerName}}</span>
+                <span style="font-size: x-large;font-family: 瀹嬩綋">鎷h揣浜猴細{{data.workerName}}</span>
             </div>
             <div style="clear:both;"></div>
         </div>
@@ -230,12 +236,12 @@
     <div style="margin-top: 10px">
         {{#each data.list}}
         <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">
+            <div class="item-header" style="margin-top: 10px;font-family: 瀹嬩綋; font-size: x-large">
                 {{maktx}}
             </div>
             <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="float: left;font-family: 瀹嬩綋; font-size: x-large">{{anfme}}{{unit}}</div>
+                <div style="float: right;font-family: 瀹嬩綋; font-size: x-large">璐т綅锛歿{locNo}}</div>
                 <div style="clear: both;"></div>
             </div>
         </div>

--
Gitblit v1.9.1