From cac5b314ea4f370235f9c40210ce792eb838c7ff Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期一, 04 八月 2025 08:12:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2

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

diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index f1e0dc5..24b9006 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -4,12 +4,16 @@
 function getCol() {
     var cols = [
         {type: 'checkbox'}
-        ,{field: 'tagId$', align: 'center',title: '褰掔被', templet: '#tagTpl'}
+        // ,{field: 'tagId$', align: 'center',title: '褰掔被', templet: '#tagTpl'}
+        // ,{field: 'storeMax', align: 'center',title: '搴撳瓨涓婇檺',width: 90}
+        // ,{field: 'storeMin', align: 'center',title: '搴撳瓨涓嬮檺',width: 90}
+        // ,{field: 'storeMaxDate', align: 'center',title: '搴撻緞涓婇檺(澶�)',width: 90}
+        // ,{field: 'status$', align: 'center',title: '鐘舵��'}
     ];
     cols.push.apply(cols, matCols);
     cols.push(
         {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
-        )
+    )
     return cols;
 }
 
@@ -334,6 +338,7 @@
                         } else {
                             res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2&param="+res.data[i].matnr;
                         }
+                        res.data[i].date = dateToStr(new Date());
                     }
                     var tpl = templateDom.html();
                     var template = Handlebars.compile(tpl);

--
Gitblit v1.9.1