From a8756c3526832332db4ef5685348d9b188c2bf2b Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 13 九月 2025 08:36:44 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 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 82c6174..7303955 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"
@@ -51,6 +51,11 @@
{ title: "鐗╂枡缂栧彿", field: "materielCode",type: "like"},
{ title: "鎵规鍙�", field: "batchNo",type: "like"},
{ title: "鎵�灞炰粨搴�", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],},
+ { title: "搴撳瓨鍒涘缓鏃堕棿",field: "createDate",type: "datetime"},
+ ],
+ [
+ { title: "鏈夋晥鏈熸煡璇�",field: "effectiveDate",type: "date"},
+ {title: "鐗╂枡鏈夋晥鏈�",field: "expirationlabel",type: "selectList",dataKey:"expirationlabelEnum",data:[]},
],
]);
const columns = ref([
@@ -117,8 +122,23 @@
align: "left"
},
{
+ field: "expirationlabel",
+ title: "鐗╂枡鏈夋晥鏈�",
+ type: "string",
+ width: 140,
+ align: "left",
+ bind: { key: "expirationlabelEnum", data: [] },
+ },
+ {
field: "materielInfo",
title: "鎵�鍚墿鏂欐渶鏃╀复鏈�",
+ type: "string",
+ width: 140,
+ align: "left",
+ },
+ {
+ field: "inventoryage",
+ title: "搴撻緞",
type: "string",
width: 140,
align: "left",
@@ -170,6 +190,7 @@
align: "left",
bind: { key: "stockStatusEmun", data: [] },
},
+
{
field: "locationType",
title: "璐т綅绫诲瀷",
--
Gitblit v1.9.3