From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp

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

diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index f1e0dc5..5e5b971 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -5,11 +5,15 @@
     var cols = [
         {type: 'checkbox'}
         ,{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;
 }
 

--
Gitblit v1.9.1