From 71be45c250688b0e76a59f93cd80e85ba37e3de7 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期五, 01 五月 2026 23:19:44 +0800
Subject: [PATCH] Merge branch 'dev'

---
 Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue b/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue
index 789e395..b4ab422 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue
+++ b/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue
@@ -21,6 +21,7 @@
   palletCode: "鎵樼洏缂栧彿",
   stockStatus: "搴撳瓨鐘舵��",
   locationCode: "璐т綅缂栧彿",
+  locationId: "璐т綅id",
   outboundDate: "鍑哄簱鏃堕棿",
   warehouse: "浠撳簱",
   creator: "鍒涘缓浜�",
@@ -63,7 +64,8 @@
       mesUploadStatus: "",
       stockStatus: "",
       locationCode: "",
-      locationDetails: ""
+      locationDetails: "",
+      locationId: "",
     });
 
 
@@ -72,11 +74,13 @@
         { field: "palletCode", title: TEXT.palletCode, type: "string" },
         { field: "stockStatus", title: TEXT.stockStatus, type: "select", dataKey: "stockStatusEmun", data: [] },
         { field: "locationCode", title: TEXT.locationCode, type: "string" },
+        { field: "locationId", title: TEXT.locationId, type: "string"},
       ],
     ]);
 
     const searchFormFields = ref({
       palletCode: "",
+      warehouseId: "",
       stockStatus: "",
       locationCode: "",
     });
@@ -84,6 +88,7 @@
     const searchFormOptions = ref([
       [
         { title: TEXT.palletCode, field: "palletCode", type: "like" },
+        { title: TEXT.warehouse, field: "warehouseId", type: "selectList", dataKey: "warehouseEnum", data: []  },
         { title: TEXT.stockStatus, field: "stockStatus", type: "selectList", dataKey: "stockStatusEmun", data: [] },
         { title: TEXT.locationCode, field: "locationCode", type: "like" },
       ],

--
Gitblit v1.9.3