From d55ef610a530c2ab0a30d6ecdc1e7e4ab54cc896 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 24 十月 2025 23:16:42 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng
---
新建文件夹/WMS/src/views/basic/locationInfo.vue | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/locationInfo.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/locationInfo.vue"
index 0c9c4fb..79096c6 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/locationInfo.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/locationInfo.vue"
@@ -37,12 +37,22 @@
locationType: "",
locationStatus: "",
enableStatus: "",
- remark: ""
+ remark: "",
+ warehouseCode:"",
});
const editFormOptions = ref([
[
- {
- field: "warehouseId",
+ // {
+ // field: "warehouseId",
+ // title: "搴撴埧缂栧彿",
+ // type: "select",
+ // required: true,
+ // span: 12,
+ // dataKey: "warehouseNuber",
+ // data: []
+ // },
+ {
+ field: "warehouseCode",
title: "搴撴埧缂栧彿",
type: "select",
required: true,
@@ -50,6 +60,7 @@
dataKey: "warehouseNuber",
data: []
},
+
{
field: "locationCode",
title: "璐т綅缂栧彿",
@@ -135,7 +146,7 @@
]
]);
const searchFormFields = ref({
- warehouseId: "",
+ // warehouseId: "",
locationCode: "",
locationName: "",
roadwayNo: "",
@@ -145,10 +156,12 @@
row: "",
column: "",
layer: "",
+ warehouseCode: ""
});
const searchFormOptions = ref([
[
- { title: "搴撴埧缂栧彿", field: "warehouseId", type: "select", dataKey: "warehouseNuber", data: [] } ,
+ // { title: "搴撴埧缂栧彿", field: "warehouseId", type: "select", dataKey: "warehouseNuber", data: [] } ,
+ { title: "搴撴埧缂栧彿", field: "warehousecode", type: "select", dataKey: "warehouseNuber", data: [] } ,
{ title: "璐т綅缂栧彿", field: "locationCode", type: "like" },
{ title: "璐т綅鍚嶇О", field: "locationName", type: "like" },
],
@@ -177,8 +190,17 @@
require: true,
align: "left",
},
+ // {
+ // field: "warehouseId",
+ // title: "搴撴埧缂栧彿",
+ // type: "select",
+ // width: 120,
+ // align: "left",
+ // data: [],
+ // bind: { key: "warehouses", data: [] }
+ // },
{
- field: "warehouseId",
+ field: "warehouseCode",
title: "搴撴埧缂栧彿",
type: "select",
width: 120,
--
Gitblit v1.9.3