From f49fa4b5027cfdc27b429985d023e8002abcca2e Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期三, 05 十一月 2025 23:54:12 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue | 128 +++++++++++++++++++++++++++++++++---------
1 files changed, 99 insertions(+), 29 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
index 55e328b..727209a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
@@ -27,19 +27,23 @@
sortName: "id",
});
const editFormFields = ref({
- deviceCode: "",
- deviceName: "",
- deviceType: "",
- deviceStatus: "",
- deviceIp: "",
- devicePort: "",
- devicePlcType: "",
- deviceRemark: "",
+ palletCode: "",
+ materialType: "",
+ locationCode: "",
+ stockStatus: "",
+ materialweight: "",
+ remark: "",
});
const editFormOptions = ref([
[
{ title: "鎵樼洏缂栧彿", field: "palletCode" },
- { title: "鐗╂枡绫诲瀷", field: "materialType" },
+ {
+ title: "鐗╂枡绫诲瀷",
+ field: "materialType",
+ type: "select",
+ dataKey: "InventoryMaterialType",
+ data: [],
+ },
{ title: "璐т綅缂栧彿", field: "locationCode" },
{
title: "搴撳瓨鐘舵��",
@@ -50,34 +54,64 @@
},
],
[
- { title: "閲嶉噺(鏁伴噺)", field: "materialweight" },
+ { title: "閲嶉噺", field: "materialweight" },
+ {
+ title: "鐗╂枡鐘舵��",
+ field: "wlstatus",
+ type: "select",
+ dataKey: "InventoryMaterialStatus",
+ data: []
+ },
+ {
+ title: "澶囨敞", field: "Remark"
+ }
],
]);
const searchFormFields = ref({
- deviceCode: "",
- deviceType: "",
- deviceStatus: "",
+ palletCode: "",
+ materialType: "",
+ locationCode: "",
+ stockStatus: "",
+ wlstatus: "",
+ createDate: "",
+ mgeneratetime: "",
});
const searchFormOptions = ref([
[
- { title: "鎵樼洏缂栧彿", field: "palletCode",displayType: "Contains"
-},
+ { title: "鎵樼洏缂栧彿",
+ field: "palletCode",
+ type: "like",
+ },
{
- title: "搴撳瓨鐘舵��",
+ title: "鐗╂枡绫诲瀷",
field: "materialType",
- type: "selectList",
- dataKey: "inventoryMaterialType",
+ type: "select",
+ dataKey: "InventoryMaterialType",
data: [],
},
- { title: "璐т綅缂栧彿", field: "locationCode" },
- {
+ { title: "璐т綅缂栧彿", field: "locationCode",type: "string", },
+
+ ],
+ [
+ {
title: "搴撳瓨鐘舵��",
field: "stockStatus",
type: "selectList",
dataKey: "stockStatusEmun",
data: [],
},
+ {
+ title: "鐗╂枡鐘舵��",
+ field: "wlstatus",
+ type: "selectList",
+ dataKey: "InventoryMaterialStatus",
+ data: [],
+ },
+ { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
],
+ [
+ { title: "鐢熶骇鏃堕棿", field: "mgeneratetime", type: "datetime" },
+ ]
]);
const columns = ref([
{
@@ -91,11 +125,21 @@
align: "left",
},
{
+ field: "id",
+ title: "搴撳瓨缂栧彿",
+ type: "string",
+ width: 90,
+ align: "left",
+ DisplayType:"link",
+ sort:true
+ },
+ {
field: "palletCode",
title: "鎵樼洏缂栧彿",
type: "string",
width: 90,
align: "left",
+ sort:true,
},
{
field: "materialType",
@@ -103,7 +147,8 @@
type: "string",
width: 150,
align: "left",
- bind: { key: "inventoryMaterialType", data: [] },
+ sort:true,
+ bind: { key: "InventoryMaterialType", data: [] },
},
{
field: "locationCode",
@@ -111,7 +156,23 @@
type: "string",
width: 150,
align: "left",
-
+ sort:true,
+ },
+ {
+ field: "wlstatus",
+ title: "鐗╂枡鐘舵��",
+ type: "string",
+ width: 150,
+ align: "left",
+ sort:true,
+ bind: { key: "InventoryMaterialStatus", data: [] },
+ },{
+ field: "mgeneratetime",
+ title: "鐢熶骇鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ sort:true,
},
{
field: "isFull",
@@ -119,6 +180,7 @@
type: "string",
width: 150,
align: "left",
+ sort:true,
bind: { key: "yesno", data: [] },
},
{
@@ -127,6 +189,7 @@
type: "string",
width: 150,
align: "left",
+ sort:true,
bind: { key: "stockStatusEmun", data: [] },
},
{
@@ -135,6 +198,14 @@
type: "string",
width: 150,
align: "left",
+ sort:true,
+ },{
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 100,
+ align: "left",
+ sort:true,
},
{
field: "creater",
@@ -142,6 +213,7 @@
type: "string",
width: 90,
align: "left",
+ sort:true,
},
{
field: "createDate",
@@ -149,13 +221,16 @@
type: "datetime",
width: 160,
align: "left",
+ sort:true,
},
+
{
field: "modifier",
title: "淇敼浜�",
type: "string",
width: 100,
align: "left",
+ sort:true,
},
{
field: "modifyDate",
@@ -163,14 +238,9 @@
type: "datetime",
width: 160,
align: "left",
+ sort:true,
},
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
+
]);
const detail = ref({
cnName: "#detailCnName",
--
Gitblit v1.9.3