From e47120b1aec14296f84fd246af76675f4c2765a0 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 29 一月 2026 09:40:20 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu

---
 代码管理/WCS/WIDESEAWCS_Client/src/views/basicinfo/kLSLocationInfo.vue |   97 ++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 85 insertions(+), 12 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basicinfo/kLSLocationInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basicinfo/kLSLocationInfo.vue"
index 6e26281..a640c62 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basicinfo/kLSLocationInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basicinfo/kLSLocationInfo.vue"
@@ -53,7 +53,7 @@
           field: "warehouseId",
           type: "input",
           width: 220,
-          require: true, // 鍚庣蹇呭~椤� 瀵瑰簲IsNullable = false
+          require: true,
         },
         {
           title: "璐т綅缂栧彿",
@@ -111,25 +111,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: "姝e父" },
+            { key: "1", value: "鍙叆" },
+            { key: "2", value: "鍙嚭" },
+            { key: "3", value: "绂佺敤" },
+          ],
         },
         {
           title: "澶囨敞",
@@ -174,12 +193,36 @@
       ],
       [
         { title: "宸烽亾缂栧彿", field: "roadwayNo", type: "like" },
-        { title: "璐т綅绫诲瀷", field: "locationType", type: "like" },
-        { title: "璐т綅鐘舵��", field: "locationStatus", type: "like" },
+        { title: "璐т綅绫诲瀷", field: "locationType", type: "select",
+            data: [
+              { key: "0", value: "鏈畾涔�" },
+              { key: "1", value: "灏忔墭鐩�" },
+              { key: "2", value: "涓墭鐩�" },
+              { key: "3", value: "澶ф墭鐩�" },
+              { key: "4", value: "鐗瑰ぇ鎵樼洏" },
+            ],
+        },
+        { 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: "姝e父" },
+              { key: "1", value: "鍙叆" },
+              { key: "2", value: "鍙嚭" },
+              { key: "3", value: "绂佺敤" },
+            ],
+         },
         { title: "鍒涘缓浜�", field: "creater", type: "like" },
         { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
       ]
@@ -256,23 +299,53 @@
       {
         field: "locationType",
         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: "澶ф墭鐩�" },
+            { key: "4", value: "鐗瑰ぇ鎵樼洏" },
+          ],
+        },
       },
       {
         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: "姝e父" },
+            { key: "1", value: "鍙叆" },
+            { key: "2", value: "鍙嚭" },
+            { key: "3", value: "绂佺敤" },
+          ],
+        },
       },
       {
         field: "creater",

--
Gitblit v1.9.3