From 0efb79506251f0be7371bf183c1b95e65ccaae8e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 27 九月 2024 16:29:17 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/mat/mat.js |   11 ++++++-----
 src/main/webapp/views/mat/mat.html   |    4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index 2805440..684cd34 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -5,9 +5,9 @@
     var cols = [
         {type: 'checkbox'}
         ,{field: 'tagId$', align: 'center',title: '褰掔被', templet: '#tagTpl'}
-        ,{field: 'store_max', align: 'center',title: '搴撳瓨涓婇檺'}
-        ,{field: 'store_min', align: 'center',title: '搴撳瓨涓嬮檺'}
-        ,{field: 'store_max_date', align: 'center',title: '搴撻緞涓婇檺(澶�)'}
+        // ,{field: 'store_max', align: 'center',title: '搴撳瓨涓婇檺'}
+        // ,{field: 'store_min', align: 'center',title: '搴撳瓨涓嬮檺'}
+        // ,{field: 'store_max_date', align: 'center',title: '搴撻緞涓婇檺(澶�)'}
     ];
     cols.push.apply(cols, matCols);
     cols.push(
@@ -333,10 +333,11 @@
                     for (let i=0;i<res.data.length;i++){
                         var templateDom = $("#templatePreview"+templateNo);
                         var className = templateDom.attr("class");
+                        var param = "缂栫爜:"+res.data[i].matnr+";鍚嶇О:"+res.data[i].maktx+";瑙勬牸:"+res.data[i].specs;
                         if (className === 'template-barcode') {
-                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1&param="+res.data[i].matnr;
+                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1&param="+param;
                         } else {
-                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2&param="+res.data[i].matnr;
+                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2&param="+param;
                         }
                     }
                     var tpl = templateDom.html();
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 7ea803d..6265f86 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -360,10 +360,10 @@
             <img class="template-qrcode" src="{{this.barcodeUrl}}">
             <div style="text-align: center;">{{this.matnr}}</div>
         </div>
-        <div style="font-size: 15px;">
+        <div style="font-size: 12px;">
             鍚嶇О锛歿{this.maktx}}
         </div>
-        <div style="font-size: 15px;">
+        <div style="font-size: 12px;">
             瑙勬牸锛歿{this.specs}}
         </div>
     </div>

--
Gitblit v1.9.1