From a770206c91e495b802b3e9371e06834586ad7715 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 30 十月 2025 20:17:30 +0800
Subject: [PATCH] 1

---
 新建文件夹/WMS/src/views/basic/locationInfo.vue |  126 +++++++++++++++++++++++++-----------------
 1 files changed, 75 insertions(+), 51 deletions(-)

diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/locationInfo.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/locationInfo.vue"
index ebd3945..3e717b4 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/locationInfo.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/locationInfo.vue"
@@ -37,19 +37,30 @@
       locationType: "",
       locationStatus: "",
       enableStatus: "",
-      remark: ""
+      remark: "",
+      warehouseCode:"",
     });
     const editFormOptions = ref([
       [
-        {
-          field: "warehouseId",
+        // {
+        //   field: "warehouseId",
+        //   title: "搴撴埧缂栧彿",
+        //   type: "select",
+        //   required: true,
+        //   span: 12,
+        //   dataKey:  "warehouseNuber", 
+        //   data: []
+        // },
+         {
+          field: "warehouseCode",
           title: "搴撴埧缂栧彿",
           type: "select",
           required: true,
           span: 12,
-          data: [],
-          bind: { key: "warehouses", data: [] }
+          dataKey:  "warehouseNuber", 
+          data: []
         },
+        
         {
           field: "locationCode",
           title: "璐т綅缂栧彿",
@@ -84,12 +95,7 @@
           type: "int",
           span: 8
         },
-        {
-          field: "layer",
-          title: "璐т綅灞�",
-          type: "int",
-          span: 8
-        }
+      
       ],
       [
         {
@@ -98,13 +104,19 @@
           type: "int",
           span: 12
         },
-        {
-          field: "locationType",
-          title: "璐т綅绫诲瀷",
-          type: "select",
-          span: 12,
-          data: [],
-          bind: { key: "locationTypeEnum", data: [] }
+        // {
+        //   field: "locationType",
+        //   title: "璐т綅绫诲瀷",
+        //   type: "select",
+        //   span: 12,
+        //   data: [],
+        //   dataKey:  "locationTypeEnum",
+        // }
+          {
+          field: "layer",
+          title: "璐т綅灞�",
+          type: "int",
+          span: 8
         }
       ],
       [
@@ -114,28 +126,28 @@
           type: "select",
           span: 12,
           data: [],
-          bind: { key: "locationStatusEnum", data: [] }
+           dataKey:  "locationStatusEnum",
         },
         {
           field: "enableStatus",
           title: "绂佺敤鐘舵��",
           type: "select",
           span: 12,
+          dataKey:"EnableStatusEnum",
           data: [],
-          bind: { key: "status", data: [] }
         }
       ],
-      [
-        {
-          field: "remark",
-          title: "澶囨敞",
-          type: "string",
-          span: 24
-        }
-      ]
+      // [
+      //   {
+      //     field: "remark",
+      //     title: "澶囨敞",
+      //     type: "string",
+      //     span: 24
+      //   }
+      // ]
     ]);
     const searchFormFields = ref({
-      warehouseId: "",
+      // warehouseId: "",
       locationCode: "",
       locationName: "",
       roadwayNo: "",
@@ -145,20 +157,23 @@
       row: "",
       column: "",
       layer: "",
+      warehouseCode: ""
     });
     const searchFormOptions = ref([
       [
-        { title: "搴撴埧缂栧彿", field: "warehouseId", type: "select", data: [], bind: { key: "warehouses", data: [] } },
+        // { title: "搴撴埧缂栧彿", field: "warehouseId", type: "select", dataKey:  "warehouseNuber",  data: [] } ,
+         { title: "搴撴埧缂栧彿", field: "warehousecode", type: "select", dataKey:  "warehouseNuber",  data: [] } ,
         { title: "璐т綅缂栧彿", field: "locationCode", type: "like" },
         { title: "璐т綅鍚嶇О", field: "locationName", type: "like" },
       ],
       [
         { title: "宸烽亾缂栧彿", field: "roadwayNo", type: "like" },
-        { title: "璐т綅绫诲瀷", field: "locationType", type: "select", data: [], bind: { key: "locationTypeEnum", data: [] } },
-        { title: "璐т綅鐘舵��", field: "locationStatus", type: "select", data: [], bind: { key: "locationStatusEnum", data: [] } },
+        // { title: "璐т綅绫诲瀷", field: "locationType", type: "select",  dataKey:  "locationTypeEnum", data: []  },       
+        { title: "璐т綅鐘舵��", field: "locationStatus", type: "select",  dataKey:  "locationStatusEnum",data: []},
+         { title: "绂佺敤鐘舵��", field: "enableStatus", type: "select", data: [], dataKey:"status" },
       ],
       [
-        { title: "绂佺敤鐘舵��", field: "enableStatus", type: "select", data: [], bind: { key: "status", data: [] } },
+
         { title: "琛�", field: "row", type: "int" },
         { title: "鍒�", field: "column", type: "int" },
         { title: "灞�", field: "layer", type: "int" }
@@ -175,14 +190,23 @@
         require: true,
         align: "left",
       },
+      // {
+      //   field: "warehouseId",
+      //   title: "搴撴埧缂栧彿",
+      //   type: "select",
+      //   width: 120,
+      //   align: "left",
+      //   data: [],
+      //   bind: { key: "warehouses", data: [] }
+      // },
       {
-        field: "warehouseId",
+        field: "warehouseCode",
         title: "搴撴埧缂栧彿",
         type: "select",
         width: 120,
         align: "left",
         data: [],
-        bind: { key: "warehouses", data: [] }
+        bind: { key: "warehouseNuber", data: [] }
       },
       {
         field: "locationCode",
@@ -233,15 +257,15 @@
         width: 100,
         align: "left",
       },
-      {
-        field: "locationType",
-        title: "璐т綅绫诲瀷",
-        type: "select",
-        width: 120,
-        align: "left",
-        data: [],
-        bind: { key: "locationTypeEnum", data: [] }
-      },
+      // {
+      //   field: "locationType",
+      //   title: "璐т綅绫诲瀷",
+      //   type: "select",
+      //   width: 120,
+      //   align: "left",
+      //   data: [],
+      //   bind: { key: "locationTypeEnum", data: [] }
+      // },
       {
         field: "locationStatus",
         title: "璐т綅鐘舵��",
@@ -260,13 +284,13 @@
         data: [],
         bind: { key: "status", data: [] },
       },
-      {
-        field: "remark",
-        title: "澶囨敞",
-        type: "string",
-        width: 150,
-        align: "left",
-      },
+      // {
+      //   field: "remark",
+      //   title: "澶囨敞",
+      //   type: "string",
+      //   width: 150,
+      //   align: "left",
+      // },
       {
         field: "creater",
         title: "鍒涘缓浜�",

--
Gitblit v1.9.3