From 22a51a35a7367bc5569ea075afe0b7f1c438b529 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期二, 20 二月 2024 11:10:23 +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/common.js |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index cc817a0..a6ba1da 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -229,7 +229,8 @@
     ,{field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜',hide: true}
     ,{field: 'suppCode', align: 'center',title: '鏂欑鐮�', hide: false}
     ,{field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜'}
-    ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+    ,{field: 'anfme', align: 'center',title: '浣滀笟鏁伴噺'}
+    ,{field: 'stock', align: 'center',title: '鎬诲簱瀛�'}
     ,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true, hide: true}
     ,{field: 'maktx', align: 'center',title: '瀛樿揣鍚嶇О'}
     ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}

--
Gitblit v1.9.1