From c17d401cd7aa87f9c1adc25733a74da6a8a210e7 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期四, 19 三月 2026 17:00:13 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215

---
 项目代码/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue"
index 1d73a86..8af5dc1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue"
@@ -75,6 +75,7 @@
       ],
       [
         { title: "搴撳瓨鐘舵��", field: "status", type: 'select', dataKey: "stockStatusEmun", data: [] },
+        { title: "浠撳簱", field: "warehouseCode", type: 'select', dataKey: "warehouse", data: [] },
       ],
     ]);
     const columns = ref([
@@ -99,7 +100,7 @@
         field: "palletCode",
         title: "鎵樼洏缂栧彿",
         type: "string",
-        width: 150,
+        width: 120,
         align: "left",
       },
       {
@@ -157,8 +158,9 @@
         field: "warehouseCode",
         title: "浠撳簱鍙�",
         type: "string",
-        width: 120,
+        width: 160,
         align: "left",
+        bind: { key: "wareHouse", data: [] },
       },
       {
         field: "barcode",
@@ -171,15 +173,16 @@
         field: "stockQuantity",
         title: "搴撳瓨鏁伴噺",
         type: "string",
-        width: 200,
+        width: 110,
         align: "left",
       },
       {
         field: "outboundQuantity",
         title: "鍑哄簱鏁伴噺",
         type: "string",
-        width: 120,
+        width: 110,
         align: "left",
+        hidden: true,
       },
       {
         field: "status",
@@ -190,6 +193,13 @@
         bind: { key: "stockStatusEmun", data: [] },
       },
       {
+        field: "validDate",
+        title: "鏈夋晥鏈�",
+        type: "datetime",
+        width: 160,
+        align: "left",
+      },
+      {
         field: "creater",
         title: "鍒涘缓浜�",
         type: "string",

--
Gitblit v1.9.3