From 9cf7b57cd6f3d56a80a5925add2d8dabee28437f Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 13 5月 2025 16:37:31 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/Config.ts |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/Config.ts b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/Config.ts
index 03b2ab3..7145af1 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/Config.ts
+++ b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/Config.ts
@@ -20,30 +20,35 @@
     field: 'placeStatusDesc',
     title: '搴撲綅鐘舵��',
   },
-  {
-    field: 'containerNo',
-    title: '瀹瑰櫒缂栧彿',
-  },
+  // {
+  //   field: 'containerNo',
+  //   title: '瀹瑰櫒缂栧彿',
+  // },
   {
     field: 'stockNumber',
     title: '搴撳瓨鏁伴噺',
   },
+  // {
+  //   field: 'materialBatch',
+  //   title: '鐗╂枡鎵规',
+  // },
   {
-    field: 'materialBatch',
-    title: '鐗╂枡鎵规',
+    field: 'materialModel',
+    title: '鍨嬪彿',
   },
   {
     field: 'areaName',
     title: '鎵�灞炲簱鍖�',
   },
-  {
-    field: 'checkStatusDesc',
-    title: '妫�楠岀姸鎬�',
-  },
-  {
-    field: 'inStockTime',
-    title: '鍏ュ簱鏃堕棿',
-  },
+  // {
+  //   field: 'checkStatusDesc',
+  //   title: '妫�楠岀姸鎬�',
+  // },
+  // {
+  //   field: 'inStockTime',
+  //   title: '鍏ュ簱鏃堕棿',
+  //   width: 180,
+  // },
   {
     field: 'isLockDesc',
     title: '閿佸畾鐘舵��',

--
Gitblit v1.9.3