From 6695afe1e1c478dbb599a1d382d8d6628b456d03 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 18 一月 2025 17:30:49 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue"
index c0490f8..aaacaa0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue"
@@ -27,7 +27,7 @@
sortName: "id",
});
const editFormFields = ref({
- areaId: "",
+ warehouseId: "",
materielCode: "",
materielName: "",
materielDes: "",
@@ -37,9 +37,9 @@
const editFormOptions = ref([
[
{
- title: "鍖哄煙",
+ title: "浠撳簱",
required: true,
- field: "areaId",
+ field: "warehouseId",
type: "string",
},
{
@@ -73,13 +73,11 @@
const searchFormFields = ref({
materielCode: "",
materielName: "",
- areaId: "",
});
const searchFormOptions = ref([
[
{ title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
{ title: "鐗╂枡鍚嶇О", field: "materielName", type: "like" },
- { title: "璁惧鐘舵��", field: "deviceStatus" },
],
]);
const columns = ref([
@@ -94,11 +92,12 @@
align: "left",
},
{
- field: "areaId",
- title: "鍖哄煙涓婚敭",
+ field: "warehouseId",
+ title: "浠撳簱",
type: "string",
- width: 90,
+ width: 100,
align: "left",
+ bind: { key: "warehouses", data: [] },
},
{
field: "materielCode",
@@ -127,6 +126,7 @@
type: "string",
width: 90,
align: "left",
+ hidden:true
},
{
field: "packspes",
@@ -134,6 +134,7 @@
type: "int",
width: 120,
align: "left",
+ hidden:true
},
{
field: "attribute",
@@ -141,6 +142,7 @@
type: "string",
width: 200,
align: "left",
+ hidden:true
},
{
field: "unit",
@@ -162,6 +164,7 @@
type: "string",
width: 120,
align: "left",
+ hidden:true
},
{
field: "creater",
@@ -183,6 +186,7 @@
type: "string",
width: 100,
align: "left",
+ hidden:true
},
{
field: "modifyDate",
@@ -190,6 +194,7 @@
type: "datetime",
width: 160,
align: "left",
+ hidden:true
},
{
field: "remark",
--
Gitblit v1.9.3