From c6e8b600398de38b6684f5fa1eaaaade8562859b Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 20 九月 2025 15:16:56 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu
---
项目代码/WMS/WMSClient/src/views/basic/locationInfo.vue | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/locationInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/locationInfo.vue"
index b6a588f..d7f13fe 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/locationInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/locationInfo.vue"
@@ -41,20 +41,20 @@
enableStatus: "",
locationStatus: "",
row: "",
- column: "",
+ columns: "",
layer: "",
});
const searchFormOptions = ref([
[
{ title: "璐т綅缂栧彿", field: "locationCode", type: "like" },
- { title: "宸烽亾缂栧彿", field: "roadwayNo",type:"like" },
+ { title: "宸烽亾缂栧彿", field: "roadwayNo",type: "select",dataKey: "Roadways" },
{ title: "璐т綅绫诲瀷", field: "locationType",type: "select",dataKey: "locationTypeEnum",data: [], },
{ title: "绂佺敤鐘舵��", field: "enableStatus" ,type: "select",dataKey: "enableStatusEnum",data: [],},
],
[
{ title: "璐т綅鐘舵��", field: "locationStatus" ,type: "selectList",dataKey: "locationStatusEnum",data: [],},
{ title: "琛�", field: "row" ,type: "int"},
- { title: "鍒�", field: "column" ,type: "int"},
+ { title: "鍒�", field: "columns" ,type: "int"},
{ title: "灞�", field: "layer" ,type: "int"}
],
]);
@@ -81,21 +81,21 @@
field: "locationCode",
title: "璐т綅缂栧彿",
type: "string",
- width: 200,
+ width: 240,
align: "left",
},
{
field: "locationName",
title: "璐т綅鍚嶇О",
type: "string",
- width: 280,
+ width: 300,
align: "left",
},
{
field: "roadwayNo",
title: "宸烽亾缂栧彿",
type: "decimal",
- width: 100,
+ width: 110,
align: "left",
},
{
@@ -104,23 +104,20 @@
type: "string",
width: 90,
align: "left",
- hidden: true,
},
{
- field: "column",
+ field: "columns",
title: "璐т綅鍒�",
- type: "int",
- width: 120,
+ type: "string",
+ width: 90,
align: "left",
- hidden: true,
},
{
field: "layer",
title: "璐т綅灞�",
type: "string",
- width: 200,
+ width: 90,
align: "left",
- hidden: true,
},
{
field: "depth",
@@ -177,6 +174,7 @@
type: "string",
width: 100,
align: "left",
+ hidden: true
},
{
field: "modifyDate",
@@ -185,6 +183,7 @@
width: 160,
align: "left",
sort: true,
+ hidden: true
},
{
field: "remark",
--
Gitblit v1.9.3