From 2b25f973bb6d72ce6971d6f9c3cdccf51b7962ab Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 06 九月 2025 14:27:08 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu

---
 项目代码/WMS/WMSClient/src/views/stock/ProStockView.vue |   47 +++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 45 insertions(+), 2 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/stock/ProStockView.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/stock/ProStockView.vue"
index ffc36b8..6543683 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/stock/ProStockView.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/stock/ProStockView.vue"
@@ -113,10 +113,24 @@
           align: "left",
         },
         {
+          field: "productName",
+          title: "鐗╂枡鍚嶇О",
+          type: "string",
+          width: 200,
+          align: "left",
+        },
+        {
           field: "lotNumber",
           title: "鐗╂枡鎵瑰彿",
           type: "string",
           width: 110,
+          align: "left",
+        },
+        {
+          field: "productSpec",
+          title: "鐗╂枡瑙勬牸",
+          type: "string",
+          width: 200,
           align: "left",
         },
         {
@@ -125,6 +139,14 @@
           type: "string",
           width: 100,
           align: "left",
+        },
+        {
+          field: "productUnit",
+          title: "鐗╂枡鍗曚綅",
+          type: "string",
+          width: 100,
+          align: "left",
+          bind: { key: "materielUnitEnum", data: [] },
         },
         {
           field: "row",
@@ -235,6 +257,27 @@
             align: "left",
           },
           {
+            field: "productName",
+            title: "鐗╂枡鍚嶇О",
+            type: "string",
+            width: 150,
+            align: "left",
+          },
+          {
+            field: "lotNumber",
+            title: "鐗╂枡鎵瑰彿",
+            type: "string",
+            width: 90,
+            align: "left",
+          },
+          {
+            field: "productSpec",
+            title: "鐗╂枡瑙勬牸",
+            type: "string",
+            width: 90,
+            align: "left",
+          },
+          {
             field: "stockQty",
             title: "搴撳瓨鏁�",
             type: "string",
@@ -242,8 +285,8 @@
             align: "left",
           },
           {
-            field: "lotNumber",
-            title: "鐗╂枡鎵瑰彿",
+            field: "productUnit",
+            title: "鍗曚綅",
             type: "string",
             width: 90,
             align: "left",

--
Gitblit v1.9.3