From 7d180121d133a3f2400ca2870cfb6cacd605d6cf Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 12 八月 2025 23:12:32 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue |   33 +++++++++++++++++++++++++++++----
 1 files changed, 29 insertions(+), 4 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue"
index 8851231..03cf33c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue"
@@ -81,6 +81,16 @@
           dataKey: "purchaseOrderStatus",
           data: [],
         },
+      ],
+      [
+        { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
+        {
+          title: "鎵�灞炰粨搴�",
+          field: "warehouseId",
+          type: "select",
+          dataKey: "warehouses",
+          data: [],
+        },
       ]
     ]);
     const columns = ref([
@@ -153,6 +163,7 @@
         type: "datetime",
         width: 160,
         align: "left",
+        
       },
       {
         field: "modifier",
@@ -203,7 +214,7 @@
           title: "琛屽彿",
           type: "string",
           width: 150,
-          align: "left",
+          align: "left"
         },
         {
           field: "materielCode",
@@ -215,12 +226,19 @@
           required: true,
         },
         {
-          field: "materielCode",
+          field: "materielName",
           title: "鐗╂枡鍚嶇О",
           type: "string",
           width: 100,
+          align: "left"
+        },
+        {
+          field: "materielSpec",
+          title: "鐗╂枡瑙勬牸",
+          type: "select",
+          type: "string",
+          width: 100,
           align: "left",
-          bind: { key: "MaterielNames", data: [] },
         },
         // {
         //   field: "batchNo",
@@ -235,7 +253,14 @@
           field: "purchaseDetailQuantity",
           title: "鍗曟嵁鏁伴噺",
           type: "decimal",
-          width: 90,
+          width: 100,
+          align: "left",
+        },
+        {
+          field:"purchaseDetailReceiveQty",
+          title: "宸叉敹鏁伴噺",
+          type: "decimal",
+          width: 100,
           align: "left",
         },
         {

--
Gitblit v1.9.3