From 61a7d9eb8c0bb672fdd3a0da2b7f48dc8cfef389 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期二, 31 三月 2026 10:48:39 +0800
Subject: [PATCH] Merge branch 'zheng'
---
Code/WMS/WIDESEA_WMSClient/src/views/stock/stock.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSClient/src/views/stock/stock.vue b/Code/WMS/WIDESEA_WMSClient/src/views/stock/stock.vue
index d1973a1..006da06 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/views/stock/stock.vue
+++ b/Code/WMS/WIDESEA_WMSClient/src/views/stock/stock.vue
@@ -46,7 +46,7 @@
{ field: "locationCode", title: "璐т綅缂栧彿", type: "string" },
],
[
- { field: "warehouseId", title: "浠撳簱", type: "select", dataKey: "warehouses", data: [] },
+ { field: "warehouseId", title: "浠撳簱", type: "select", dataKey: "warehouseEnum", data: [] },
{ field: "stockStatus", title: "搴撳瓨鐘舵��", type: "select", dataKey: "stockStatusEmun", data: [] },
{ field: "outboundDate", title: "鍑哄簱鏃ユ湡", type: "datetime" },
],
@@ -79,7 +79,7 @@
{ field: "palletType", title: "鎵樼洏绫诲瀷", type: "int", width: 110, align: "left" },
{ field: "locationId", title: "璐т綅ID", type: "int", width: 110, align: "left", hidden: true },
{ field: "locationCode", title: "璐т綅缂栧彿", type: "string", width: 130, align: "left" },
- { field: "warehouseId", title: "浠撳簱", type: "select", width: 110, align: "left", bind: { key: "warehouses", data: [] } },
+ { field: "warehouseId", title: "浠撳簱", type: "select", width: 110, align: "left", bind: { key: "warehouseEnum", data: [] } },
{ field: "stockStatus", title: "搴撳瓨鐘舵��", type: "int", width: 120, align: "left", bind: { key: "stockStatusEmun", data: [] } },
{ field: "outboundDate", title: "鍑哄簱鏃ユ湡", type: "datetime", width: 160, align: "left" },
{ field: "creater", title: "鍒涘缓浜�", type: "string", width: 100, align: "left" },
--
Gitblit v1.9.3