From b196900d48deefb0129e28df0a842fadc3d6bff1 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:54:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs

---
 src/main/webapp/views/pda/stockIn.html |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index 9384793..e1957e5 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -121,7 +121,8 @@
             cols: [[
                 {fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
                 {field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿'},
-                {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'}
+                {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'},
+                {field: 'model', align: 'center',title: '浜у搧浠g爜'}
             ]],
             done: function (res, curr, count) {
 

--
Gitblit v1.9.1