From be46f73bea1f2dc8453f37a32454c9e6f798e579 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 15 六月 2020 13:09:15 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/matCode/matCode.html |   73 +++++++++++++++++++++++++++++++-----
 1 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 1738de0..2c85ddf 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -133,12 +133,12 @@
             <div id="template-container" style="margin: 20px;text-align: center">
 
                 <!-- 棰勮鍥� 1 -->
-                <div id="template-preview-1" class="template-preview" style="display: none">
+                <div id="template-preview-1" 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="center" scope="col">鏉＄爜</td>
                             <td class="barcode" colspan="3" align="center" scope="col">
-                                <img class="template-code" src="" width="80%">
+                                <img class="template-code template-barcode" src="" width="80%">
                                 <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
                                     <span>xxxxxx</span>
                                 </div>
@@ -180,7 +180,7 @@
                         </tr>
                         <tr>
                             <td align="center" colspan="6" style="border: none">
-                                <img class="template-code" src="" width="80%">
+                                <img class="template-code template-barcode" src="" width="80%">
                                 <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
                                     <span>xxxxxx</span>
                                 </div>
@@ -190,8 +190,32 @@
                 </div>
 
                 <!-- 棰勮鍥� 3 -->
-                <div id="template-preview-3" class="template-preview" style="display: inline-block">
-
+                <div id="template-preview-3" class="template-preview" style="display: none">
+                    <table class="contain" height="217" width="317" style="overflow: hidden;font-size: xx-small">
+                        <tr>
+                            <td align="center" scope="col" width="50%" colspan="3">鐗╂枡缂栫爜</td>
+                            <td align="center" scope="col" width="50%" colspan="3">xxxxxx-xx/xx</td>
+                        </tr>
+                        <tr>
+                            <td align="center" colspan="3">鐗╂枡鍚嶇О</td>
+                            <td align="center" colspan="3">xxxxxxx</td>
+                        </tr>
+                        <tr>
+                            <td align="center" width="50%" rowspan="1" colspan="3">鐗╂枡瑙勬牸</td>
+                            <td align="center" width="50%" colspan="3" rowspan="4">
+                                <img class="template-code template-qrcode" src="">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td align="center" colspan="3" rowspan="1">xxxxxx</td>
+                        </tr>
+                        <tr>
+                            <td align="center" colspan="3" rowspan="1">鐗╂枡鍗曚綅</td>
+                        </tr>
+                        <tr>
+                            <td align="center" colspan="3" rowspan="1">xxxxxxxx</td>
+                        </tr>
+                    </table>
                 </div>
 
             </div>
@@ -205,18 +229,19 @@
 
 <!-- 鍒濆鍖栨墦鍗版ā鏉跨殑鏉″舰鐮� -->
 <script type="text/javascript">
-    $('.template-code').attr("src", baseUrl+"/macCode/code/auth?type=1&param=123");
+    $('.template-barcode').attr("src", baseUrl+"/macCode/code/auth?type=1&param=123");
+    $('.template-qrcode').attr("src", baseUrl+"/macCode/code/auth?type=2&param=123");
 </script>
 
 <!-- 妯℃澘寮曟搸 -->
 <!-- 妯℃澘1 -->
-<script type="text/template" id="templatePreview1">
+<script type="text/template" id="templatePreview1" class="template-barcode">
     {{#each data}}
     <table class="contain" height="217" width="317" style="overflow: hidden;font-size: xx-small">
         <tr>
             <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%">
+                <img class="template-code" src="{{this.barcodeUrl}}" width="80%">
                 <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
                     <span>{{this.barcode}}</span>
                 </div>
@@ -238,7 +263,7 @@
     {{/each}}
 </script>
 <!-- 妯℃澘2 -->
-<script type="text/template" id="templatePreview2">
+<script type="text/template" id="templatePreview2" class="template-barcode">
     {{#each data}}
     <table class="contain" height="217" width="317" style="overflow: hidden;font-size: xx-small">
         <tr>
@@ -269,8 +294,34 @@
     {{/each}}
 </script>
 <!-- 妯℃澘3 -->
-<script type="text/template" id="templatePreview3">
-
+<script type="text/template" id="templatePreview3" class="template-qrcode">
+    {{#each data}}
+    <table class="contain" height="217" width="317" style="overflow: hidden;font-size: xx-small">
+        <tr>
+            <td align="center" scope="col" width="50%" colspan="3">鐗╂枡缂栫爜</td>
+            <td align="center" scope="col" width="50%" colspan="3">{{this.matNo}}</td>
+        </tr>
+        <tr>
+            <td align="center" colspan="3">鐗╂枡鍚嶇О</td>
+            <td align="center" colspan="3">{{this.matName}}</td>
+        </tr>
+        <tr>
+            <td align="center" width="50%" rowspan="1" colspan="3">鐗╂枡鍗曚綅</td>
+            <td align="center" width="50%" colspan="3" rowspan="4">
+                <img class="template-code template-qrcode" src="{{this.barcodeUrl}}">
+            </td>
+        </tr>
+        <tr>
+            <td align="center" colspan="3" rowspan="1">{{this.str1}}</td>
+        </tr>
+        <tr>
+            <td align="center" colspan="3" rowspan="1">鐗╂枡瑙勬牸</td>
+        </tr>
+        <tr>
+            <td align="center" colspan="3" rowspan="1">{{this.str2}}</td>
+        </tr>
+    </table>
+    {{/each}}
 </script>
 
 </body>

--
Gitblit v1.9.1