From 702a6ed32127f963eea9953f32d7494419d6a32c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 26 三月 2025 15:57:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

---
 src/main/webapp/static/js/mat/mat.js |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index f1e0dc5..ac98ca5 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -5,11 +5,14 @@
     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: '搴撻緞涓婇檺(澶�)'}
     ];
     cols.push.apply(cols, matCols);
     cols.push(
         {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
-        )
+    )
     return cols;
 }
 
@@ -255,6 +258,7 @@
                 }
                 // 琛ㄥ崟鎻愪氦浜嬩欢
                 form.on('submit(editSubmit)', function (data) {
+                    console.log(data)
                     data.field.tagId = insXmSel.getValue('valueStr');
                     if (isEmpty(data.field.tagId)) {
                         layer.msg('鍒嗙被涓嶈兘涓虹┖', {icon: 2});
@@ -329,10 +333,12 @@
                     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;
+                        var encodeUrl = encodeURIComponent(param);
                         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="+encodeUrl;
                         } 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="+encodeUrl;
                         }
                     }
                     var tpl = templateDom.html();

--
Gitblit v1.9.1