From 59c8d02d2bc7c7d9651edbd755ad73e4e7843ed8 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 09 一月 2025 09:32:05 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue"
index c0490f8..b2f15b4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue"
@@ -27,7 +27,7 @@
       sortName: "id",
     });
     const editFormFields = ref({
-      areaId: "",
+      warehouseId: "",
       materielCode: "",
       materielName: "",
       materielDes: "",
@@ -37,9 +37,9 @@
     const editFormOptions = ref([
       [
         {
-          title: "鍖哄煙",
+          title: "浠撳簱",
           required: true,
-          field: "areaId",
+          field: "warehouseId",
           type: "string",
         },
         {
@@ -73,13 +73,11 @@
     const searchFormFields = ref({
       materielCode: "",
       materielName: "",
-      areaId: "",
     });
     const searchFormOptions = ref([
       [
         { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
         { title: "鐗╂枡鍚嶇О", field: "materielName", type: "like" },
-        { title: "璁惧鐘舵��", field: "deviceStatus" },
       ],
     ]);
     const columns = ref([
@@ -94,7 +92,7 @@
         align: "left",
       },
       {
-        field: "areaId",
+        field: "warehouseId",
         title: "鍖哄煙涓婚敭",
         type: "string",
         width: 90,
@@ -127,6 +125,7 @@
         type: "string",
         width: 90,
         align: "left",
+        hidden:true
       },
       {
         field: "packspes",
@@ -134,6 +133,7 @@
         type: "int",
         width: 120,
         align: "left",
+        hidden:true
       },
       {
         field: "attribute",
@@ -141,6 +141,7 @@
         type: "string",
         width: 200,
         align: "left",
+        hidden:true
       },
       {
         field: "unit",
@@ -162,6 +163,7 @@
         type: "string",
         width: 120,
         align: "left",
+        hidden:true
       },
       {
         field: "creater",
@@ -183,6 +185,7 @@
         type: "string",
         width: 100,
         align: "left",
+        hidden:true
       },
       {
         field: "modifyDate",
@@ -190,6 +193,7 @@
         type: "datetime",
         width: 160,
         align: "left",
+        hidden:true
       },
       {
         field: "remark",

--
Gitblit v1.9.3