From 95909e9515f99f7aa9ead0c6e31456457363273e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 06 三月 2025 17:34:57 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue"
index 703a792..73bdbb7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue"
@@ -49,7 +49,8 @@
],
[
{ title: "鐗╂枡缂栧彿", field: "materielCode",type: "like"},
- { title: "鎵规鍙�", field: "batchNo",type: "like"}
+ { title: "鎵规鍙�", field: "batchNo",type: "like"},
+ { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],},
],
]);
const columns = ref([
@@ -86,6 +87,14 @@
align: "left",
},
{
+ field: "warehouseId",
+ title: "鎵�灞炰粨搴�",
+ type: "string",
+ width: 80,
+ align: "left",
+ bind: { key: "warehouses", data: [] },
+ },
+ {
field: "roadwayNo",
title: "宸烽亾缂栧彿",
type: "decimal",
@@ -93,7 +102,6 @@
align: "left",
hidden:true
},
-
{
field: "materielCode",
title: "鎵�鍚墿鏂欑紪鍙�",
@@ -111,6 +119,13 @@
{
field: "materielInfo",
title: "鎵�鍚墿鏂欐渶鏃╀复鏈�",
+ type: "string",
+ width: 140,
+ align: "left",
+ },
+ {
+ field: "sumStock",
+ title: "鎬诲簱瀛�",
type: "string",
width: 140,
align: "left",
@@ -299,14 +314,14 @@
field: "productionDate",
title: "鐢熶骇鏃ユ湡",
type: "string",
- width: 80,
+ width: 120,
align: "left",
},
{
field: "effectiveDate",
title: "鏈夋晥鏃ユ湡",
type: "string",
- width: 80,
+ width: 120,
align: "left",
},
{
--
Gitblit v1.9.3