From 681d093f9ea16ab2d480d77e6b04b197e506ff60 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 19 六月 2025 01:29:12 +0800
Subject: [PATCH] 1

---
 代码管理/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue |  122 +++++++++++++++++++---------------------
 1 files changed, 57 insertions(+), 65 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue"
index cdde3cd..54f2424 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue"
@@ -27,71 +27,18 @@
       sortName: "id",
     });
     const editFormFields = ref({
-      row: "",
-      column: "",
-      layer: "",
-      depth: "",
-      locationType: "",
       locationStatus: "",
-      enalbeStatus: "",
-      remark: "",
     });
     const editFormOptions = ref([
       [
         {
-          title: "璐т綅琛�",
-          required: true,
-          field: "row",
-          type: "string",
-        },
-        {
-          title: "璐т綅鍒�",
-          required: true,
-          field: "column",
-          type: "string",
-        },
-        {
-          title: "璐т綅灞�",
-          required: true,
-          field: "layer",
-          type: "string",
-        },
-        {
-          title: "璐т綅娣卞害",
-          required: true,
-          field: "depth",
-          type: "string",
-        },
-      ],
-      [
-        { title: "璐т綅绫诲瀷", required: true, field: "locationType", type: "string" },
-        {
           title: "璐т綅鐘舵��",
-          required: true,
           field: "locationStatus",
-          type: "string",
-        },
-        {
-          title: "绂佺敤鐘舵��",
-          required: true,
-          field: "enalbeStatus",
-          type: "string",
-        },
-        {
-          title: "鍖哄煙涓婚敭",
-          required: true,
-          field: "areaId",
-          type: "string",
+          type: "select",
+          dataKey: "locationStatusEnum",
+          data: [],
         },
       ],
-      [
-      {
-          title: "宸烽亾缂栧彿",
-          required: true,
-          field: "roadwayNo",
-          type: "string",
-        },
-      ]
     ]);
     const searchFormFields = ref({
       locationCode: "",
@@ -99,8 +46,43 @@
     });
     const searchFormOptions = ref([
       [
-        { title: "璐т綅缂栧彿", field: "locationCode" },
-        { title: "宸烽亾缂栧彿", field: "roadwayNo" },
+        { title: "璐т綅缂栧彿", field: "locationCode", type: "like" },
+        { title: "宸烽亾缂栧彿", field: "roadwayNo", type: "like" },
+        {
+          title: "璐т綅绫诲瀷",
+          field: "locationType",
+          type: "select",
+          dataKey: "locationTypeEnum",
+          data: [],
+        },
+      ],
+      [
+        {
+          title: "鍖哄煙",
+          field: "areaId",
+          type: "select",
+          dataKey: "locationareainfo",
+          data: [],
+        },
+        {
+          title: "璐т綅鐘舵��",
+          field: "locationStatus",
+          type: "selectList",
+          dataKey: "locationStatusEnum",
+          data: [],
+        },
+        {
+          title: "绂佺敤鐘舵��",
+          field: "enableStatus",
+          type: "select",
+          dataKey: "enableStatusEnum",
+          data: [],
+        },
+      ],
+      [
+        { title: "鎺�/琛�", field: "row" },
+        { title: "鍒�", field: "column"},
+        { title: "灞�", field: "layer" },
       ],
     ]);
     const columns = ref([
@@ -116,23 +98,24 @@
       },
       {
         field: "areaId",
-        title: "鍖哄煙涓婚敭",
+        title: "鍖哄煙",
         type: "string",
         width: 90,
         align: "left",
+        bind: { key: "locationareainfo", data: [] },
       },
       {
         field: "locationCode",
         title: "璐т綅缂栧彿",
         type: "string",
-        width: 150,
+        width: 180,
         align: "left",
       },
       {
         field: "locationName",
         title: "璐т綅鍚嶇О",
         type: "string",
-        width: 150,
+        width: 220,
         align: "left",
       },
       {
@@ -144,24 +127,27 @@
       },
       {
         field: "row",
-        title: "璐т綅琛�",
+        title: "鎺�",
         type: "string",
         width: 90,
         align: "left",
+        hidden: true,
       },
       {
         field: "column",
-        title: "璐т綅鍒�",
+        title: "鍒�",
         type: "int",
         width: 120,
         align: "left",
+        hidden: true,
       },
       {
         field: "layer",
-        title: "璐т綅灞�",
+        title: "灞�",
         type: "string",
         width: 200,
         align: "left",
+        hidden: true,
       },
       {
         field: "depth",
@@ -169,6 +155,7 @@
         type: "string",
         width: 180,
         align: "left",
+        hidden: true,
       },
       {
         field: "locationType",
@@ -176,6 +163,7 @@
         type: "string",
         width: 120,
         align: "left",
+        bind: { key: "locationTypeEnum", data: [] },
       },
       {
         field: "locationStatus",
@@ -183,13 +171,15 @@
         type: "string",
         width: 200,
         align: "left",
+        bind: { key: "locationStatusEnum", data: [] },
       },
       {
-        field: "enalbeStatus",
+        field: "enableStatus",
         title: "绂佺敤鐘舵��",
         type: "string",
         width: 180,
         align: "left",
+        bind: { key: "enableStatusEnum", data: [] },
       },
       {
         field: "creater",
@@ -204,6 +194,7 @@
         type: "datetime",
         width: 160,
         align: "left",
+        sort: true,
       },
       {
         field: "modifier",
@@ -218,6 +209,7 @@
         type: "datetime",
         width: 160,
         align: "left",
+        sort: true,
       },
       {
         field: "remark",

--
Gitblit v1.9.3