From 0875bfa35d389e238ae82142ce45b71c9715133b Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期五, 17 四月 2026 17:37:39 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Client/src/views/basicinfo/rGVLocationInfo.vue | 91 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 74 insertions(+), 17 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basicinfo/rGVLocationInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basicinfo/rGVLocationInfo.vue"
index 0396f48..b3c71b9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basicinfo/rGVLocationInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basicinfo/rGVLocationInfo.vue"
@@ -45,7 +45,6 @@
remark: "",
});
- // 鏂板/缂栬緫琛ㄥ崟甯冨眬+鏍￠獙閰嶇疆 瀹屽叏鍖归厤鍚庣瀛楁绾︽潫
const editFormOptions = ref([
[
{
@@ -53,7 +52,7 @@
field: "warehouseId",
type: "input",
width: 220,
- require: true, // 鍚庣鏍囪 IsNullable = false 蹇呬紶椤�
+ require: true,
},
{
title: "璐т綅缂栧彿",
@@ -111,25 +110,44 @@
{
title: "璐т綅绫诲瀷",
field: "locationType",
- type: "input",
+ type: "select",
width: 120,
require: false,
+ data: [
+ { key: "0", value: "鏈畾涔�" },
+ { key: "1", value: "灏忔墭鐩�" },
+ { key: "2", value: "涓墭鐩�" },
+ { key: "3", value: "澶ф墭鐩�" },
+ { key: "4", value: "鐗瑰ぇ鎵樼洏" },
+ ],
},
{
title: "璐т綅鐘舵��",
field: "locationStatus",
- type: "input",
+ type: "select",
width: 120,
require: false,
- defaultValue: "0", // 瀵瑰簲鍚庣 DefaultValue = "0"
+ data: [
+ { key: "0", value: "绌洪棽" },
+ { key: "1", value: "閿佸畾" },
+ { key: "10", value: "鍏ュ簱閿佸畾" },
+ { key: "20", value: "鍑哄簱閿佸畾" },
+ { key: "100", value: "鏈夎揣" },
+ { key: "99", value: "澶ф墭鐩橀攣瀹�" },
+ ],
},
{
title: "绂佺敤鐘舵��",
field: "enableStatus",
- type: "input",
+ type: "select",
width: 120,
require: false,
- defaultValue: "0", // 瀵瑰簲鍚庣 DefaultValue = "0"
+ data: [
+ { key: "0", value: "姝ｅ父" },
+ { key: "1", value: "鍙叆" },
+ { key: "2", value: "鍙嚭" },
+ { key: "3", value: "绂佺敤" },
+ ],
},
{
title: "澶囨敞",
@@ -151,7 +169,7 @@
]
]);
- // 鎼滅储琛ㄥ崟 鍙屽悜缁戝畾瀛楁
+ // 鎼滅储琛ㄥ崟缁戝畾瀛楁
const searchFormFields = ref({
warehouseId: "",
locationCode: "",
@@ -164,28 +182,45 @@
createDate: "",
});
- // 鎼滅储琛ㄥ崟绛涢�夎鍒欓厤缃�
+ // 鎼滅储琛ㄥ崟甯冨眬閰嶇疆椤�
const searchFormOptions = ref([
[
- { title: "浠撳簱缂栧彿", field: "warehouseId", type: "like" },
{ title: "璐т綅缂栧彿", field: "locationCode", type: "like" },
+ { title: "浠撳簱缂栧彿", field: "warehouseId", type: "equal" },
{ title: "璐т綅鍚嶇О", field: "locationName", type: "like" },
],
[
{ title: "宸烽亾缂栧彿", field: "roadwayNo", type: "like" },
- { title: "璐т綅绫诲瀷", field: "locationType", type: "like" },
- { title: "璐т綅鐘舵��", field: "locationStatus", type: "like" },
+ { title: "璐т綅绫诲瀷", field: "locationType", type: "select",dataKey: "RGVLocationTypeEnum",data:[]
+ },
+ { title: "璐т綅鐘舵��", field: "locationStatus", type: "select",
+ data: [
+ { key: "0", value: "绌洪棽" },
+ { key: "1", value: "閿佸畾" },
+ { key: "10", value: "鍏ュ簱閿佸畾" },
+ { key: "20", value: "鍑哄簱閿佸畾" },
+ { key: "100", value: "鏈夎揣" },
+ { key: "99", value: "澶ф墭鐩橀攣瀹�" },
+ ],
+ },
],
[
- { title: "绂佺敤鐘舵��", field: "enableStatus", type: "like" },
+ { title: "绂佺敤鐘舵��", field: "enableStatus", type: "select",
+ data: [
+ { key: "0", value: "姝ｅ父" },
+ { key: "1", value: "鍙叆" },
+ { key: "2", value: "鍙嚭" },
+ { key: "3", value: "绂佺敤" },
+ ],
+ },
{ title: "鍒涘缓浜�", field: "creater", type: "like" },
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
]
]);
- // 琛ㄦ牸鍒楅厤缃� 瀹屾暣鏄犲皠鍚庣瀹炰綋鎵�鏈夊瓧娈�+鍏叡瀹¤瀛楁
+ // 琛ㄦ牸鍒楅厤缃� - 1:1 瀵瑰簲鍚庣Dt_KLSLocationInfo瀹炰綋鎵�鏈夊瓧娈�+鍏叡瀛楁
const columns = ref([
{
field: "id",
@@ -256,23 +291,45 @@
{
field: "locationType",
title: "璐т綅绫诲瀷",
- type: "int",
+ type: "select",
width: 100,
align: "left",
+ key: "value",
+ bind: { key: "RGVLocationTypeEnum", data: [] },
},
{
field: "locationStatus",
title: "璐т綅鐘舵��",
- type: "int",
+ type: "select",
width: 100,
align: "left",
+ bind: {
+ key: "value",
+ data: [
+ { key: "0", value: "绌洪棽" },
+ { key: "1", value: "閿佸畾" },
+ { key: "10", value: "鍏ュ簱閿佸畾" },
+ { key: "20", value: "鍑哄簱閿佸畾" },
+ { key: "100", value: "鏈夎揣" },
+ { key: "99", value: "澶ф墭鐩橀攣瀹�" },
+ ],
+ },
},
{
field: "enableStatus",
title: "绂佺敤鐘舵��",
- type: "int",
+ type: "select",
width: 100,
align: "left",
+ bind: {
+ key: "value",
+ data: [
+ { key: "0", value: "姝ｅ父" },
+ { key: "1", value: "鍙叆" },
+ { key: "2", value: "鍙嚭" },
+ { key: "3", value: "绂佺敤" },
+ ],
+ },
},
{
field: "creater",
--
Gitblit v1.9.3