From 1caea0fdc7ed1788d854a2aba8853984b4494e01 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期二, 24 六月 2025 09:56:28 +0800
Subject: [PATCH] 代码提交

---
 代码管理/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue |  173 +++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 111 insertions(+), 62 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue"
index e448d8c..10ae007 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue"
@@ -31,22 +31,52 @@
       pointCode: "",
       pointStatus: "",
       enableStatus: "",
-      pointType: "",
-      row: "",
-      column: "",
-      depth: "",
+
+      // depth: "",
     });
     const editFormOptions = ref([
       [
-        {title: "缂撳瓨鐐圭紪鍙�",required: true,field: "pointCode",type: "string",},
-        {title: "鍖哄煙涓婚敭",required: true,field: "areaId",type: "select",dataKey: "areainfo", data: [] ,},
-        {title: "缂撳瓨鐐圭姸鎬�",field: "pointStatus",type: "select",dataKey: "locationStatusEnum",data: [],},
-        {title: "鏄惁绂佺敤",field: "enableStatus",type: "select",dataKey: "enableStatusEnum",data: [],},
-      ],[
-        { title: "琛�", field: "row", type: "string" },
-        { title: "鍒�", field: "column", type: "string" },
-        { title: "娣卞害", field: "depth", type: "string" },
-        { title: "缂撳瓨鐐圭被鍨�", field: "pointType", type: "string"},
+        {
+          title: "缂撳瓨鐐圭紪鍙�",
+          required: true,
+          field: "pointCode",
+          type: "string",
+        },
+        // {title: "鍖哄煙涓婚敭",required: true,field: "areaId",type: "select",dataKey: "areainfo", data: [] ,},
+        {
+          title: "缂撳瓨鐐圭姸鎬�",
+          field: "pointStatus",
+          type: "select",
+          dataKey: "locationStatusEnum",
+          data: [],
+        },
+        {
+          title: "鏄惁绂佺敤",
+          field: "enableStatus",
+          type: "select",
+          dataKey: "enableStatusEnum",
+          data: [],
+        },
+                { title: "鐗╂枡绫诲瀷", field: "materialtype", type: "string" },
+        // {
+        //   title: "鐗╂枡绫诲瀷",
+        //   field: "materialtype",
+        //   type: "select",
+        //   dataKey: "materielInfo",
+        //   data: [],
+        // },
+        {
+          title: "娣卞害",
+          field: "depth",
+          type: "string",
+          data: [],
+        },
+        {
+          title: "缂撳瓨鏋跺尯鍩�",
+          field: "pointName",
+          type: "string",
+          data: [],
+        },
       ],
     ]);
     const searchFormFields = ref({
@@ -54,22 +84,51 @@
       pointCode: "",
       pointStatus: "",
       enableStatus: "",
-      pointType: "",
-      row: "",
-      column: "",
+      // pointType: "",
+      // row: "",
+      // column: "",
       depth: "",
+      pointName:"",
+      Materialtype: "",
     });
     const searchFormOptions = ref([
       [
-        {title: "缂撳瓨鐐圭紪鍙�",field: "pointCode",type: "string",},
-        {title: "鍖哄煙涓婚敭",field: "areaId",type: "select",dataKey: "areainfo",data: [],},
-        {title: "缂撳瓨鐐圭姸鎬�",field: "pointStatus",type: "select",dataKey: "locationStatusEnum",data: [],},
-        {title: "鏄惁绂佺敤",field: "enableStatus",type: "select",dataKey: "enableStatusEnum",data: [],},
-      ],[
-        { title: "琛�", field: "row", type: "string" },
-        { title: "鍒�", field: "column", type: "string" },
-        { title: "娣卞害", field: "depth", type: "string" },
-        { title: "缂撳瓨鐐圭被鍨�", field: "pointType", type: "string"},
+        { title: "缂撳瓨鐐圭紪鍙�", field: "pointCode", type: "like" },
+        { title: "鐗╂枡绫诲瀷", field: "materialtype", type: "like" },
+        // {
+        //   title: "鐗╂枡绫诲瀷",
+        //   field: "materialtype",
+        //   type: "select",
+        //   dataKey: "materielInfo",
+        //   data: [],
+        // },
+        // {title: "鍖哄煙涓婚敭",field: "areaId",type: "select",dataKey: "areainfo",data: [],},
+        {
+          title: "缂撳瓨鐐圭姸鎬�",
+          field: "pointStatus",
+          type: "select",
+          dataKey: "locationStatusEnum",
+          data: [],
+        },
+        {
+          title: "鏄惁绂佺敤",
+          field: "enableStatus",
+          type: "select",
+          dataKey: "enableStatusEnum",
+          data: [],
+        },
+        {
+          title: "娣卞害",
+          field: "depth",
+          type: "string",
+          data: [],
+        },
+        {
+          title: "缂撳瓨鏋跺尯鍩�",
+          field: "pointName",
+          type: "string",
+          data: [],
+        },
       ],
     ]);
     const columns = ref([
@@ -83,14 +142,14 @@
         require: true,
         align: "left",
       },
-      {
-        field: "areaId",
-        title: "鍖哄煙涓婚敭",
-        type: "int",
-        width: 120,
-        align: "left",
-        bind:{ key: "areainfo", data: [] },
-      },
+      //  {
+      //  field: "areaId",
+      //   title: "鍖哄煙涓婚敭",
+      //   type: "int",
+      //   width: 120,
+      //   align: "left",
+      //   bind:{ key: "areainfo", data: [] },
+      // },
       {
         field: "pointCode",
         title: "缂撳瓨鐐圭紪鍙�",
@@ -107,6 +166,23 @@
         bind: { key: "locationStatusEnum", data: [] },
       },
       {
+        field: "materialtype",
+        title: "鐗╂枡绫诲瀷",
+        type: "string",
+        width: 90,
+        align: "left",
+        // bind: { key: "locationStatusEnum", data: [] },
+      },
+      {
+        field: "pointName",
+        title: "缂撳瓨鏋跺尯鍩�",
+        type: "string",
+        width: 90,
+        align: "left",
+        // bind: { key: "locationStatusEnum", data: [] },
+      },
+
+      {
         field: "enableStatus",
         title: "鏄惁绂佺敤",
         type: "decimal",
@@ -114,38 +190,11 @@
         align: "left",
         bind: { key: "enableStatusEnum", data: [] },
       },
-      {
-        field: "row",
-        title: "琛�",
-        type: "string",
-        width: 90,
-        align: "left",
-      },
-      {
-        field: "column",
-        title: "鍒�",
-        type: "string",
-        width: 90,
-        align: "left",
-      },
+
       {
         field: "depth",
         title: "娣卞害",
-        type: "string",
-        width: 90,
-        align: "left",
-      },
-      {
-        field: "pointType",
-        title: "缂撳瓨鐐圭被鍨�",
-        type: "string",
-        width: 90,
-        align: "left",
-      },
-      {
-        field: "Remark",
-        title: "澶囨敞",
-        type: "string",
+        type: "int",
         width: 90,
         align: "left",
       },

--
Gitblit v1.9.3