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 |   38 +++++++++++++++++++++-----------------
 1 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue b/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue
index 6703a37..b4ab422 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue
+++ b/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue
@@ -1,16 +1,7 @@
 <template>
-  <view-grid
-    ref="grid"
-    :columns="columns"
-    :detail="detail"
-    :editFormFields="editFormFields"
-    :editFormOptions="editFormOptions"
-    :searchFormFields="searchFormFields"
-    :searchFormOptions="searchFormOptions"
-    :table="table"
-    :tableExpand="tableExpand"
-    :extend="extend"
-  >
+  <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+    :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+    :table="table" :tableExpand="tableExpand" :extend="extend">
   </view-grid>
 </template>
 
@@ -30,6 +21,8 @@
   palletCode: "鎵樼洏缂栧彿",
   stockStatus: "搴撳瓨鐘舵��",
   locationCode: "璐т綅缂栧彿",
+  locationId: "璐т綅id",
+  outboundDate: "鍑哄簱鏃堕棿",
   warehouse: "浠撳簱",
   creator: "鍒涘缓浜�",
   createDate: "鍒涘缓鏃堕棿",
@@ -64,27 +57,30 @@
       sortName: "id",
     });
 
-     const editFormFields = ref({
+    const editFormFields = ref({
       palletCode: "",
       palletType: 0,
       warehouseId: 0,
       mesUploadStatus: "",
       stockStatus: "",
       locationCode: "",
-      locationDetails: ""
+      locationDetails: "",
+      locationId: "",
     });
 
 
     const editFormOptions = ref([
       [
         { field: "palletCode", title: TEXT.palletCode, type: "string" },
-        { field: "stockStatus", title: TEXT.stockStatus, type: "select", dataKey: "stockStatusEmun", data: []},
+        { 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: "",
     });
@@ -92,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" },
       ],
@@ -112,7 +109,7 @@
         field: "palletCode",
         title: TEXT.palletCode,
         type: "string",
-        width: 120,
+        width: 150,
         align: "left",
       },
       {
@@ -132,10 +129,17 @@
         bind: { key: "mesUploadStatusEnum", data: [] },
       },
       {
+        field: "outboundDate",
+        title: TEXT.outboundDate,
+        type: "string",
+        width: 150,
+        align: "left",
+      }, 
+      {
         field: "locationCode",
         title: TEXT.locationCode,
         type: "string",
-        width: 150,
+        width: 120,
         align: "left",
       },
       {

--
Gitblit v1.9.3