From bfc11f87e2b64420c9917c0b9881b3e327d6f796 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 04 十一月 2025 22:19:59 +0800
Subject: [PATCH] 优化调拨出入库

---
 新建文件夹/WMS/src/views/basic/locationInfo.vue |  273 +++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 208 insertions(+), 65 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 298e017..e34e8df 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"
@@ -1,4 +1,3 @@
-
 <template>
   <view-grid
     ref="grid"
@@ -13,7 +12,7 @@
   >
   </view-grid>
 </template>
-    <script>
+<script>
 import extend from "@/extension/basic/locationInfo.js";
 import { ref, defineComponent } from "vue";
 export default defineComponent({
@@ -27,140 +26,294 @@
       sortName: "id",
     });
     const editFormFields = ref({
-      locationStatus: "",
-    });
-    const editFormOptions = ref([
-      [
-        { title: "璐т綅鐘舵��", field: "locationStatus" ,type: "select",dataKey: "locationStatusEnum",data: [],},
-      ],
-    ]);
-    const searchFormFields = ref({
+      warehouseId: "",
       locationCode: "",
+      locationName: "",
       roadwayNo: "",
-      locationType: "",
-      enableStatus: "",
-      locationStatus: "",
       row: "",
       column: "",
       layer: "",
+      depth: "",
+      locationType: "",
+      locationStatus: "",
+      enableStatus: "",
+      remark: "",
+      warehouseCode: "",
+    });
+    const editFormOptions = ref([
+      [
+        // {
+        //   field: "warehouseId",
+        //   title: "搴撴埧缂栧彿",
+        //   type: "select",
+        //   required: true,
+        //   span: 12,
+        //   dataKey:  "warehouseNuber",
+        //   data: []
+        // },
+        {
+          field: "warehouseCode",
+          title: "搴撴埧缂栧彿",
+          type: "select",
+          required: true,
+          span: 12,
+          dataKey: "warehouseNuber",
+          data: [],
+        },
+
+        {
+          field: "locationCode",
+          title: "璐т綅缂栧彿",
+          type: "string",
+          span: 12,
+        },
+      ],
+      [
+        {
+          field: "locationName",
+          title: "璐т綅鍚嶇О",
+          type: "string",
+          span: 12,
+        },
+        {
+          field: "roadwayNo",
+          title: "宸烽亾缂栧彿",
+          type: "string",
+          span: 12,
+        },
+      ],
+      [
+        {
+          field: "row",
+          title: "璐т綅琛�",
+          type: "int",
+          span: 8,
+        },
+        {
+          field: "column",
+          title: "璐т綅鍒�",
+          type: "int",
+          span: 8,
+        },
+      ],
+      [
+        {
+          field: "depth",
+          title: "璐т綅娣卞害",
+          type: "int",
+          span: 12,
+        },
+        // {
+        //   field: "locationType",
+        //   title: "璐т綅绫诲瀷",
+        //   type: "select",
+        //   span: 12,
+        //   data: [],
+        //   dataKey:  "locationTypeEnum",
+        // }
+        {
+          field: "layer",
+          title: "璐т綅灞�",
+          type: "int",
+          span: 8,
+        },
+      ],
+      [
+        {
+          field: "locationStatus",
+          title: "璐т綅鐘舵��",
+          type: "select",
+          span: 12,
+          data: [],
+          dataKey: "locationStatusEnum",
+        },
+        {
+          field: "enableStatus",
+          title: "绂佺敤鐘舵��",
+          type: "select",
+          span: 12,
+          dataKey: "EnableStatusEnum",
+          data: [],
+        },
+      ],
+      // [
+      //   {
+      //     field: "remark",
+      //     title: "澶囨敞",
+      //     type: "string",
+      //     span: 24
+      //   }
+      // ]
+    ]);
+    const searchFormFields = ref({
+      // warehouseId: "",
+      locationCode: "",
+      locationName: "",
+      roadwayNo: "",
+      locationType: "",
+      locationStatus: "",
+      enableStatus: "",
+      row: "",
+      column: "",
+      layer: "",
+      warehouseCode: "",
     });
     const searchFormOptions = ref([
       [
+        // { title: "搴撴埧缂栧彿", field: "warehouseId", type: "select", dataKey:  "warehouseNuber",  data: [] } ,
+        {
+          title: "搴撴埧缂栧彿",
+          field: "warehousecode",
+          type: "select",
+          dataKey: "warehouseNuber",
+          data: [],
+        },
         { title: "璐т綅缂栧彿", field: "locationCode", type: "like" },
-        { title: "宸烽亾缂栧彿", field: "roadwayNo",type:"like" },
-        { title: "璐т綅绫诲瀷", field: "locationType",type: "select",dataKey: "locationTypeEnum",data: [], },
-        { title: "绂佺敤鐘舵��", field: "enableStatus" ,type: "select",dataKey: "status",data: [],},
+        { title: "璐т綅鍚嶇О", field: "locationName", type: "like" },
       ],
       [
-        { title: "璐т綅鐘舵��", field: "locationStatus" ,type: "selectList",dataKey: "locationStatusEnum",data: [],},
-        { title: "琛�", field: "row" ,type: "int"},
-        { title: "鍒�", field: "column" ,type: "int"},
-        { title: "灞�", field: "layer" ,type: "int"}
+        { title: "宸烽亾缂栧彿", field: "roadwayNo", type: "like" },
+        // { 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: "row", type: "int" },
+        { title: "鍒�", field: "column", type: "int" },
+        { title: "灞�", field: "layer", type: "int" },
       ],
     ]);
     const columns = ref([
       {
         field: "id",
-        title: "Id",
+        title: "涓婚敭",
         type: "int",
-        width: 100,
+        width: 90,
         hidden: true,
         readonly: true,
         require: true,
         align: "left",
       },
       // {
-      //   field: "areaId",
-      //   title: "鍖哄煙涓婚敭",
-      //   type: "string",
-      //   width: 90,
+      //   field: "warehouseId",
+      //   title: "搴撴埧缂栧彿",
+      //   type: "select",
+      //   width: 120,
       //   align: "left",
-      //   bind: {key: "areainfo",data: []}
+      //   data: [],
+      //   bind: { key: "warehouses", data: [] }
       // },
+      {
+        field: "warehouseCode",
+        title: "搴撴埧缂栧彿",
+        type: "select",
+        width: 120,
+        align: "left",
+        data: [],
+        bind: { key: "warehouseNuber", data: [] },
+      },
       {
         field: "locationCode",
         title: "璐т綅缂栧彿",
         type: "string",
-        width: 200,
+        width: 120,
         align: "left",
       },
       {
         field: "locationName",
         title: "璐т綅鍚嶇О",
         type: "string",
-        width: 280,
+        width: 150,
         align: "left",
       },
       {
         field: "roadwayNo",
         title: "宸烽亾缂栧彿",
-        type: "decimal",
+        type: "string",
         width: 100,
         align: "left",
+        hidden: true,
       },
       {
         field: "row",
         title: "璐т綅琛�",
-        type: "string",
-        width: 90,
+        type: "int",
+        width: 80,
         align: "left",
-        hidden: true,
       },
       {
         field: "column",
         title: "璐т綅鍒�",
         type: "int",
-        width: 120,
+        width: 80,
         align: "left",
-        hidden: true,
       },
       {
         field: "layer",
         title: "璐т綅灞�",
-        type: "string",
-        width: 200,
+        type: "int",
+        width: 80,
         align: "left",
-        hidden: true,
       },
       {
         field: "depth",
         title: "璐т綅娣卞害",
-        type: "string",
-        width: 180,
+        type: "int",
+        width: 100,
         align: "left",
-        hidden: true,
       },
-      {
-        field: "locationType",
-        title: "璐т綅绫诲瀷",
-        type: "string",
-        width: 120,
-        align: "left",
-        bind:{key: "locationTypeEnum", data: []}
-      },
+      // {
+      //   field: "locationType",
+      //   title: "璐т綅绫诲瀷",
+      //   type: "select",
+      //   width: 120,
+      //   align: "left",
+      //   data: [],
+      //   bind: { key: "locationTypeEnum", data: [] }
+      // },
       {
         field: "locationStatus",
         title: "璐т綅鐘舵��",
-        type: "string",
+        type: "select",
         width: 120,
         align: "left",
+        data: [],
         bind: { key: "locationStatusEnum", data: [] },
       },
       {
         field: "enableStatus",
         title: "绂佺敤鐘舵��",
-        type: "string",
-        width: 80,
+        type: "select",
+        width: 100,
         align: "left",
+        data: [],
         bind: { key: "status", data: [] },
       },
+      // {
+      //   field: "remark",
+      //   title: "澶囨敞",
+      //   type: "string",
+      //   width: 150,
+      //   align: "left",
+      // },
       {
         field: "creater",
         title: "鍒涘缓浜�",
         type: "string",
-        width: 90,
+        width: 100,
         align: "left",
-        hidden: true,
       },
       {
         field: "createDate",
@@ -169,7 +322,6 @@
         width: 160,
         align: "left",
         sort: true,
-        hidden: true,
       },
       {
         field: "modifier",
@@ -185,14 +337,6 @@
         width: 160,
         align: "left",
         sort: true,
-      },
-      {
-        field: "remark",
-        title: "澶囨敞",
-        type: "string",
-        width: 100,
-        align: "left",
-        hidden: true
       },
     ]);
     const detail = ref({
@@ -213,5 +357,4 @@
     };
   },
 });
-</script>
-    
\ No newline at end of file
+</script>
\ No newline at end of file

--
Gitblit v1.9.3