From c38154df95a2c2fa1bd32c45f6be9c0d98e37440 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 29 四月 2025 10:52:14 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

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

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue"
index ccadec6..528ef98 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue"
@@ -46,23 +46,18 @@
         },
       ],
       [
+        
         {
           title: "鐗╂枡缂栫爜",
           field: "materielCode",
-          type: "select",
-          required: true,
-          // dataKey: "MaterielCodes",
-          data: [],
+          type: "string",
         },
       ],
       [
         {
           title: "閲囪喘鍗曞彿",
           field: "purchaseOrderNo",
-          type: "select",
-          // dataKey: "purchaseOrderNos",
-          data: [],
-          required: true,
+          type: "string",
         },
       ],
       [
@@ -76,7 +71,7 @@
         {
           title: "鏁伴噺",
           field: "quantity",
-          required: true,
+          type:"int"
         },
       ],
       [
@@ -100,7 +95,10 @@
       palletCode: "",
     });
     const searchFormOptions = ref([
-      [{ title: "鎵规鍙�", field: "lotNo", type: "like" }],
+      [
+        { title: "閲囪喘鍗曞彿", field: "purchaseOrderNo", type: "like" },
+        { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
+      ],
     ]);
     const columns = ref([
       {
@@ -121,6 +119,13 @@
         align: "left",
       },
       {
+        field: "materielName",
+        title: "鐗╂枡鍚嶇О",
+        type: "string",
+        width: 100,
+        align: "left",
+      },
+      {
         field: "warehouseId",
         title: "浠撳簱",
         type: "string",
@@ -136,6 +141,13 @@
         align: "left",
       },
       {
+        field: "supplierCode",
+        title: "渚涘簲鍟嗙紪鍙�",
+        type: "string",
+        width: 160,
+        align: "left",
+      },
+      {
         field: "lotNo",
         title: "鎵规鍙�",
         type: "string",

--
Gitblit v1.9.3