From 6b5f9a3d86bc0189d29242588d23e3d0c997940c Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 27 九月 2024 12:59:44 +0800
Subject: [PATCH] #打印

---
 src/main/webapp/static/js/mat/mat.js |    1 
 src/main/webapp/views/mat/mat.html   |   62 ++++++++++++------------------
 2 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index 2805440..3adcdaa 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -333,6 +333,7 @@
                     for (let i=0;i<res.data.length;i++){
                         var templateDom = $("#templatePreview"+templateNo);
                         var className = templateDom.attr("class");
+                        console.log(templateDom)
                         if (className === 'template-barcode') {
                             res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1&param="+res.data[i].matnr;
                         } else {
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 9b97c49..82bce12 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -280,26 +280,20 @@
         <fieldset class="layui-elem-field site-demo-button" style="margin-top: 30px;text-align: left;">
             <legend>鎵撳嵃棰勮</legend>
             <div id="template-container" style="margin: 20px;text-align: center">
-
                 <!-- 棰勮鍥� 1 -->
                 <div id="template-preview-1" class="template-preview" style="display: inline-block">
-                    <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
-                        <tr style="height: 74px">
-                            <td colspan="3" align="center" scope="col">鍟嗗搧缂栫爜</td>
-                            <td class="barcode" colspan="9" align="center" scope="col">
-                                <img class="template-code template-barcode" src="" width="90%;">
-                                <div style="letter-spacing: 2px;margin-top: 1px; text-align: center;">
-                                    <span>xxxxxx</span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr style="height: 74px">
-                            <td align="center" colspan="3">鍟嗗搧</td>
-                            <td align="center" colspan="5">xxxxxx-xx/xx</td>
-                            <td align="center" colspan="2">澶囨敞</td>
-                            <td align="center" colspan="2">xx</td>
-                        </tr>
-                    </table>
+                    <div style="width: 150px;height: 300px;">
+                        <div>
+                            <img class="template-qrcode" src="">
+                            <div>xxxxx</div>
+                        </div>
+                        <div>
+                            鍚嶇О锛歺xxx
+                        </div>
+                        <div>
+                            瑙勬牸锛歺xxxx
+                        </div>
+                    </div>
                 </div>
 
                 <!-- 棰勮鍥� 2 -->
@@ -359,26 +353,20 @@
 </script>
 
 <!-- 妯℃澘寮曟搸 -->
-<!-- 妯℃澘1 -->
-<script type="text/template" id="templatePreview1" class="template-barcode">
+<script type="text/template" id="templatePreview1" class="template-qrcode">
     {{#each data}}
-    <table class="contain" width="280" style="overflow: hidden;font-size: small;table-layout: fixed;">
-        <tr style="height: 74px">
-            <td align="center" colspan="3" scope="col">鍟嗗搧缂栫爜</td>
-            <td align="center" class="barcode" colspan="9" scope="col">
-                <img class="template-code" src="{{this.barcodeUrl}}" width="90%">
-                <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
-                    <span>{{this.matnr}}</span>
-                </div>
-            </td>
-        </tr>
-        <tr style="height: 74px">
-            <td align="center" colspan="3">鍟嗗搧</td>
-            <td align="center" colspan="5" style="overflow: hidden; white-space: nowrap;text-overflow: ellipsis;">{{this.maktx}}</td>
-            <td align="center" colspan="2">澶囨敞</td>
-            <td align="center" colspan="2">{{this.memo}}</td>
-        </tr>
-    </table>
+    <div style="width: 150px;height: 300px;">
+        <div>
+            <img class="template-qrcode" src="{{this.barcodeUrl}}">
+            <div style="text-align: center;">{{this.matnr}}</div>
+        </div>
+        <div>
+            鍚嶇О锛歿{this.maktx}}
+        </div>
+        <div>
+            瑙勬牸锛歿{this.specs}}
+        </div>
+    </div>
     {{/each}}
 </script>
 <!-- 妯℃澘2 -->

--
Gitblit v1.9.1