From 695571c6009ecbc12e7d4a4fb147df7967a1260e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 07 七月 2025 20:21:19 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/stock/ProStockView.vue | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/ProStockView.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/ProStockView.vue"
index c6840cb..7feab4e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/ProStockView.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/ProStockView.vue"
@@ -38,23 +38,22 @@
palletCode: "",
// locationCode: "",
materielCode:"",
- batchNo:""
+ batchNo:"",
+ specifyVer:""
});
const searchFormOptions = ref([
[
- { title: "鎵樼洏缂栧彿", field: "palletCode",type: "like" },
+ { title: "鑳舵鍙�", field: "palletCode",type: "like" },
// { title: "璐т綅缂栧彿", field: "locationCode",type: "like" },
{ title: "璐т綅鐘舵��", field: "locationStatus" ,type: "selectList",dataKey: "locationStatusEnum",data: [],},
{ title: "搴撳瓨鐘舵��", field: "stockStatus",type: "selectList",dataKey: "stockStatusEmun",data: [],},
- ],
- [
{ title: "浜у搧缂栫爜", field: "productCode",type: "like"},
- { title: "浜у搧鐗堟湰", field: "productVersion",type: "like"},
- { title: "浜у搧鍛ㄦ湡", field: "dateCode",type: "like"},
],
[
- { title: "浜у搧鎵瑰彿", field: "lotNumber",type: "like"},
- { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],},
+
+ { title: "浜у搧鐗堟湰", field: "productVersion",type: "like"},
+ { title: "鎸囨淳鐗堟湰", field: "specifyVer",type: "like"},
+ { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],},
]
]);
const columns = ref([
@@ -70,7 +69,7 @@
},
{
field: "palletCode",
- title: "鎵樼洏缂栧彿",
+ title: "鑳舵鍙�",
type: "string",
width: 150,
link: true,
@@ -94,7 +93,7 @@
field: "warehouseId",
title: "鎵�灞炰粨搴�",
type: "string",
- width: 80,
+ width: 120,
align: "left",
bind: { key: "warehouses", data: [] },
},
@@ -129,10 +128,17 @@
align: "left"
},
{
+ field: "specifyVer",
+ title: "鎸囨淳鐗堟湰",
+ type: "string",
+ width: 100,
+ align: "left"
+ },
+ {
field: "dateCode",
title: "浜у搧鍛ㄦ湡",
type: "string",
- width: 140,
+ width: 100,
align: "left",
},
{
@@ -143,6 +149,13 @@
align: "left",
},
{
+ field: "sumStocks",
+ title: "搴撳瓨鏁伴噺",
+ type: "string",
+ width: 140,
+ align: "left",
+ },
+ {
field: "erpOrder",
title: "ERP宸ュ崟",
type: "string",
--
Gitblit v1.9.3