From 0691d54265bdec95baa48d83a46d7f2937472613 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 07 四月 2024 09:36:22 +0800
Subject: [PATCH] Merge branch 'tzskasrs-2' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-2

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

diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index 6202067..f435790 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -8,6 +8,7 @@
         ,{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(
@@ -337,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