From b680585c3a6d43f0c72a83a115ea537ce8c91a07 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期六, 13 十二月 2025 17:44:10 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/views/stock/stockView.vue | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockView.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockView.vue"
index 2b25f87..fe81dcc 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockView.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockView.vue"
@@ -44,7 +44,14 @@
[
{ title: "鐗╂枡缂栧彿", field: "materielCode",type: "like"},
{ title: "鎵规鍙�", field: "batchNo",type: "like"},
- { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],},
+ { title: "鎵�灞炰粨搴�", field: "locationType",type: "select",dataKey: "locationType",data: [],},
+ { title: "鎵�鍚潯鐮�", field: "barcode",type: "like"},
+ ],
+ [
+ { title: "渚涘簲鍟嗙紪鍙�", field: "supplyCode",type: "like"},
+ { title: "鎵�鍚崟鎹紪鍙�", field: "orderNo",type: "like"},
+ { title: "搴撳瓨鍒涘缓鏃堕棿", field: "createDate",type: "datetime"},
+
],
]);
const columns = ref([
@@ -59,6 +66,14 @@
align: "left",
},
{
+ field: "locationType",
+ title: "鎵�灞炰粨搴�",
+ type: "string",
+ width: 150,
+ align: "left",
+ bind: { key: "locationType", data: [] },
+ },
+ {
field: "palletCode",
title: "鎵樼洏缂栧彿",
type: "string",
@@ -70,14 +85,14 @@
field: "locationCode",
title: "璐т綅缂栧彿",
type: "string",
- width: 200,
+ width: 150,
align: "left",
},
{
field: "locationName",
title: "璐т綅鍚嶇О",
type: "string",
- width: 150,
+ width: 120,
align: "left",
},
@@ -93,7 +108,7 @@
field: "orderStatistics",
title: "鎵�鍚墿鏂欐槑缁�",
type: "string",
- width: 240,
+ width: 630,
align: "left",
},
{
@@ -143,7 +158,7 @@
},
{
field: "locationType",
- title: "璐т綅绫诲瀷",
+ title: "璐т綅鍖哄煙",
type: "string",
width: 140,
align: "left",
--
Gitblit v1.9.3