From 4f39dcc195f28fa275fc2d065fbf1bf6a46c21b7 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 17 六月 2025 00:41:18 +0800
Subject: [PATCH] 优化出入库逻辑

---
 代码管理/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue |  110 +++++++++++++++++++++++++------------------------------
 1 files changed, 50 insertions(+), 60 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 dd114ec..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,60 +27,16 @@
       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: "areaId",
-          type: "string",
-        },
-        {
-          title: "宸烽亾缂栧彿",
-          required: true,
-          field: "roadwayNo",
-          type: "string",
+          title: "璐т綅鐘舵��",
+          field: "locationStatus",
+          type: "select",
+          dataKey: "locationStatusEnum",
+          data: [],
         },
       ],
     ]);
@@ -90,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([
@@ -107,14 +98,11 @@
       },
       {
         field: "areaId",
-        title: "鍖哄煙涓婚敭",
+        title: "鍖哄煙",
         type: "string",
         width: 90,
         align: "left",
-        bind: {
-          key: "areainfo",
-          data: []
-        }
+        bind: { key: "locationareainfo", data: [] },
       },
       {
         field: "locationCode",
@@ -139,7 +127,7 @@
       },
       {
         field: "row",
-        title: "璐т綅琛�",
+        title: "鎺�",
         type: "string",
         width: 90,
         align: "left",
@@ -147,7 +135,7 @@
       },
       {
         field: "column",
-        title: "璐т綅鍒�",
+        title: "鍒�",
         type: "int",
         width: 120,
         align: "left",
@@ -155,7 +143,7 @@
       },
       {
         field: "layer",
-        title: "璐т綅灞�",
+        title: "灞�",
         type: "string",
         width: 200,
         align: "left",
@@ -175,7 +163,7 @@
         type: "string",
         width: 120,
         align: "left",
-        bind:{key: "locationTypeEnum", data: []}
+        bind: { key: "locationTypeEnum", data: [] },
       },
       {
         field: "locationStatus",
@@ -206,6 +194,7 @@
         type: "datetime",
         width: 160,
         align: "left",
+        sort: true,
       },
       {
         field: "modifier",
@@ -220,6 +209,7 @@
         type: "datetime",
         width: 160,
         align: "left",
+        sort: true,
       },
       {
         field: "remark",

--
Gitblit v1.9.3