From d14030746fcd0310d3c9b028fe2c0a5b78984eb6 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期二, 21 四月 2026 19:44:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXinNengYuan into dev

---
 Code/WMS/WIDESEA_WMSClient/src/views/stock/groupPalle.vue |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/Code/WMS/WIDESEA_WMSClient/src/views/stock/groupPalle.vue b/Code/WMS/WIDESEA_WMSClient/src/views/stock/groupPalle.vue
index 0c45982..17b5580 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/views/stock/groupPalle.vue
+++ b/Code/WMS/WIDESEA_WMSClient/src/views/stock/groupPalle.vue
@@ -64,26 +64,35 @@
       sortName: "id",
     });
 
-    const editFormFields = ref({
+     const editFormFields = ref({
       palletCode: "",
+      palletType: 0,
+      warehouseId: 0,
+      mesUploadStatus: "",
+      stockStatus: "",
       locationCode: "",
+      locationDetails: ""
     });
+
 
     const editFormOptions = ref([
       [
         { field: "palletCode", title: TEXT.palletCode, type: "string" },
+        { field: "stockStatus", title: TEXT.stockStatus, type: "select", dataKey: "stockStatusEmun", data: []},
         { field: "locationCode", title: TEXT.locationCode, type: "string" },
       ],
     ]);
 
     const searchFormFields = ref({
       palletCode: "",
+      stockStatus: "",
       locationCode: "",
     });
 
     const searchFormOptions = ref([
       [
         { title: TEXT.palletCode, field: "palletCode", type: "like" },
+        { title: TEXT.stockStatus, field: "stockStatus", type: "selectList", dataKey: "stockStatusEmun", data: [] },
         { title: TEXT.locationCode, field: "locationCode", type: "like" },
       ],
     ]);

--
Gitblit v1.9.3