From a839d3319fa44a950f09f158ab7e9a686fbd0e87 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 六月 2020 14:48:46 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/matCode/matCode.html |  115 ++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 76 insertions(+), 39 deletions(-)

diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index c99c587..64d98ae 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -28,13 +28,13 @@
 
 
         .contain {
-            border: 1px solid #000;
+            /*border: 1px solid #000;*/
             /*width: 100%;*/
         }
         .contain td {
             border: 1px solid #000;
             /*line-height: 46px;*/
-            text-align: center;
+            /*text-align: center;*/
         }
         /*.qrcode {*/
         /*    margin: 3px;*/
@@ -174,23 +174,25 @@
 <!--                    </table>-->
                     <table class="contain" height="217" width="317" style="overflow: hidden;font-size: xx-small">
                         <tr>
-                            <td colspan="1" align="right" scope="col">鏉$爜</td>
-                            <td class="barcode" colspan="3" align="left" scope="col">
+                            <td colspan="1" align="center" scope="col">鏉$爜</td>
+                            <td class="barcode" colspan="3" align="center" scope="col">
                                 <img class="template-qrcode" src="" width="80%">
-                                <div style="letter-spacing: 2px;margin-top: 3px">xxxxxx</div>
+                                <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
+                                    <span>xxxxxx</span>
+                                </div>
                             </td>
                         </tr>
                         <tr>
-                            <td align="right" width="25%">鐗╂枡缂栫爜</td>
-                            <td align="right" width="25%">xxxxxx-xx/xx</td>
-                            <td align="right" width="25%">鐗╂枡鍚嶇О</td>
-                            <td align="right" width="25%">xxxxxxx</td>
+                            <td align="center" width="25%">鐗╂枡缂栫爜</td>
+                            <td align="center" width="25%">xxxxxx-xx/xx</td>
+                            <td align="center" width="25%">鐗╂枡鍚嶇О</td>
+                            <td align="center" width="25%">xxxxxxx</td>
                         </tr>
                         <tr>
-                            <td align="right" width="25%">鐗╂枡鍗曚綅</td>
-                            <td align="right" width="25%">xxxxxxxx</td>
-                            <td align="right" width="25%">鐗╂枡瑙勬牸</td>
-                            <td align="right" width="25%">xxxxxxx</td>
+                            <td align="center" width="25%">鐗╂枡鍗曚綅</td>
+                            <td align="center" width="25%">xxxxxxxx</td>
+                            <td align="center" width="25%">鐗╂枡瑙勬牸</td>
+                            <td align="center" width="25%">xxxxxxx</td>
                         </tr>
                     </table>
                 </div>
@@ -199,23 +201,28 @@
                 <div id="template-preview-2" class="template-preview" style="display: inline-block">
                     <table class="contain" height="217" width="317" style="overflow: hidden;font-size: xx-small">
                         <tr>
-                            <td colspan="1" align="right" scope="col">鏉$爜</td>
-                            <td class="barcode" colspan="3" align="left" scope="col">
+                            <td align="center" scope="col" width="20%" colspan="1">鐗╂枡缂栫爜</td>
+                            <td align="center" scope="col" width="80%" colspan="5">xxxxxx-xx/xx</td>
+                        </tr>
+                        <tr>
+                            <td align="center" colspan="1">鐗╂枡鍚嶇О</td>
+                            <td align="center" colspan="5">xxxxxxx</td>
+                        </tr>
+                        <tr>
+                            <td align="center" colspan="1">鐗╂枡鍗曚綅</td>
+                            <td align="center" colspan="5">xxxxxxxx</td>
+                        </tr>
+                        <tr>
+                            <td align="center" colspan="1">鐗╂枡瑙勬牸</td>
+                            <td align="center" colspan="5">xxxxxxx</td>
+                        </tr>
+                        <tr>
+                            <td align="center" colspan="6" style="border: none">
                                 <img class="template-qrcode" src="" width="80%">
-                                <div style="letter-spacing: 2px;margin-top: 3px">xxxxxx</div>
+                                <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
+                                    <span>xxxxxx</span>
+                                </div>
                             </td>
-                        </tr>
-                        <tr>
-                            <td align="right" width="25%">鐗╂枡缂栫爜</td>
-                            <td align="right" width="25%">xxxxxx-xx/xx</td>
-                            <td align="right" width="25%">鐗╂枡鍚嶇О</td>
-                            <td align="right" width="25%">xxxxxxx</td>
-                        </tr>
-                        <tr>
-                            <td align="right" width="25%">鐗╂枡鍗曚綅</td>
-                            <td align="right" width="25%">xxxxxxxx</td>
-                            <td align="right" width="25%">鐗╂枡瑙勬牸</td>
-                            <td align="right" width="25%">xxxxxxx</td>
                         </tr>
                     </table>
                 </div>
@@ -242,29 +249,59 @@
     {{#each data}}
     <table class="contain" height="217" width="317" style="overflow: hidden;font-size: xx-small">
         <tr>
-            <td colspan="1" align="right" scope="col">鏉$爜</td>
-            <td class="barcode" colspan="3" align="left" scope="col">
+            <td align="center" colspan="1" scope="col">鏉$爜</td>
+            <td align="center" class="barcode" colspan="3" scope="col">
                 <img class="qrcode" src="{{this.barcodeUrl}}" width="80%">
-                <div style="letter-spacing: 2px;margin-top: 3px">{{this.barcode}}</div>
+                <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
+                    <span>{{this.barcode}}</span>
+                </div>
             </td>
         </tr>
         <tr>
-            <td align="right" width="25%">鐗╂枡缂栫爜</td>
-            <td align="right" width="25%">{{this.matNo}}</td>
-            <td align="right" width="25%">鐗╂枡鍚嶇О</td>
-            <td align="right" width="25%">{{this.matName}}</td>
+            <td align="center" width="25%">鐗╂枡缂栫爜</td>
+            <td align="center" width="25%">{{this.matNo}}</td>
+            <td align="center" width="25%">鐗╂枡鍚嶇О</td>
+            <td align="center" width="25%">{{this.matName}}</td>
         </tr>
         <tr>
-            <td align="right" width="25%">鐗╂枡鍗曚綅</td>
-            <td align="right" width="25%">{{this.str1}}</td>
-            <td align="right" width="25%">鐗╂枡瑙勬牸</td>
-            <td align="right" width="25%">{{this.str2}}</td>
+            <td align="center" width="25%">鐗╂枡鍗曚綅</td>
+            <td align="center" width="25%">{{this.str1}}</td>
+            <td align="center" width="25%">鐗╂枡瑙勬牸</td>
+            <td align="center" width="25%">{{this.str2}}</td>
         </tr>
     </table>
     {{/each}}
 </script>
 <!-- 妯℃澘2 -->
 <script type="text/template" id="templatePreview2">
+    {{#each data}}
+    <table class="contain" height="217" width="317" style="overflow: hidden;font-size: xx-small">
+        <tr>
+            <td align="center" scope="col" width="20%" colspan="1">鐗╂枡缂栫爜</td>
+            <td align="center" scope="col" width="80%" colspan="5">{{this.matNo}}</td>
+        </tr>
+        <tr>
+            <td align="center" colspan="1">鐗╂枡鍚嶇О</td>
+            <td align="center" colspan="5">{{this.matName}}</td>
+        </tr>
+        <tr>
+            <td align="center" colspan="1">鐗╂枡鍗曚綅</td>
+            <td align="center" colspan="5">{{this.str1}}</td>
+        </tr>
+        <tr>
+            <td align="center" colspan="1">鐗╂枡瑙勬牸</td>
+            <td align="center" colspan="5">{{this.str2}}</td>
+        </tr>
+        <tr>
+            <td align="center" colspan="6" style="border: none">
+                <img class="template-qrcode" src="{{this.barcodeUrl}}" width="80%">
+                <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
+                    <span>{{this.matNo}}</span>
+                </div>
+            </td>
+        </tr>
+    </table>
+    {{/each}}
 </script>
 <!-- 妯℃澘3 -->
 <script type="text/template" id="templatePreview3">

--
Gitblit v1.9.1