From 87d873ad509b4c927ac19aebaa3622fe9374626b Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期二, 26 十一月 2024 11:13:02 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue | 98 +++++++++++++++++++++++++++----------------------
1 files changed, 54 insertions(+), 44 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 0adaf93..5499e6d 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"
@@ -38,50 +38,19 @@
});
const editFormOptions = ref([
[
+ { title: "鎵樼洏缂栧彿", field: "palletCode" },
+ { title: "鐗╂枡绫诲瀷", field: "materialType" },
+ { title: "璐т綅缂栧彿", field: "locationCode" },
{
- title: "璁惧缂栧彿",
- required: true,
- field: "deviceCode",
- type: "string",
- },
- {
- title: "璁惧鍚嶇О",
- required: true,
- field: "deviceName",
- type: "string",
- },
- {
- title: "璁惧绫诲瀷",
- required: true,
- field: "deviceType",
- type: "string",
- },
- {
- title: "璁惧鐘舵��",
- required: true,
- field: "deviceStatus",
- type: "string",
- },
+ title: "搴撳瓨鐘舵��",
+ field: "stockStatus",
+ type: "select",
+ dataKey: "stockStatusEmun",
+ data: [],
+ },
],
[
- { title: "璁惧IP", required: true, field: "deviceIp", type: "string" },
- {
- title: "璁惧绔彛",
- required: true,
- field: "devicePort",
- type: "string",
- },
- {
- title: "PLC绫诲瀷",
- required: true,
- field: "devicePlcType",
- type: "string",
- },
- {
- title: "澶囨敞",
- field: "deviceRemark",
- type: "string",
- },
+ { title: "閲嶉噺", field: "materialweight" },
],
]);
const searchFormFields = ref({
@@ -91,9 +60,25 @@
});
const searchFormOptions = ref([
[
- { title: "璁惧缂栧彿", field: "deviceCode" },
- { title: "璁惧绫诲瀷", field: "deviceType" },
- { title: "璁惧鐘舵��", field: "deviceStatus" },
+ { title: "鎵樼洏缂栧彿",
+ field: "palletCode",
+ type: "like",
+ },
+ {
+ title: "鐗╂枡绫诲瀷",
+ field: "materialType",
+ type: "select",
+ dataKey: "InventoryMaterialType",
+ data: [],
+ },
+ { title: "璐т綅缂栧彿", field: "locationCode" },
+ {
+ title: "搴撳瓨鐘舵��",
+ field: "stockStatus",
+ type: "selectList",
+ dataKey: "stockStatusEmun",
+ data: [],
+ },
],
]);
const columns = ref([
@@ -113,6 +98,15 @@
type: "string",
width: 90,
align: "left",
+ DisplayType:"link"
+ },
+ {
+ field: "materialType",
+ title: "鐗╂枡绫诲瀷",
+ type: "string",
+ width: 150,
+ align: "left",
+ bind: { key: "InventoryMaterialType", data: [] },
},
{
field: "locationCode",
@@ -120,6 +114,7 @@
type: "string",
width: 150,
align: "left",
+
},
{
field: "isFull",
@@ -130,6 +125,21 @@
bind: { key: "yesno", data: [] },
},
{
+ field: "stockStatus",
+ title: "搴撳瓨鐘舵��",
+ type: "string",
+ width: 150,
+ align: "left",
+ bind: { key: "stockStatusEmun", data: [] },
+ },
+ {
+ field: "materialweight",
+ title: "閲嶉噺(鏁伴噺)",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
field: "creater",
title: "鍒涘缓浜�",
type: "string",
--
Gitblit v1.9.3