From fc36e9f71f1238e0c4d65ebb897bb54a68204463 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 02 四月 2026 14:50:11 +0800
Subject: [PATCH] 生产报表联调,并优化页面

---
 src/views/productionManagement/productionOrder/index.vue |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 7018d63..c123928 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -139,7 +139,7 @@
     },
     {
       label: "鐢熶骇鎵瑰彿",
-      prop: "lotNo",
+      prop: "batchNo",
       width: '120px',
     },
     {
@@ -165,6 +165,11 @@
     {
       label: "瑙勬牸",
       prop: "specificationModel",
+      width: '120px',
+    },
+    {
+      label: "鏂欏彿",
+      prop: "materialCode",
       width: '120px',
     },
     {
@@ -399,6 +404,7 @@
           processRouteCode: data.processRouteCode || "",
           productName: data.productName || "",
           model: data.model || "",
+          materialCode: data.materialCode || "",
           bomNo: data.bomNo || "",
           description: data.description || "",
           orderId,
@@ -419,6 +425,7 @@
         bomNo: row.bomNo || "",
         productName: row.productCategory || "",
         productModelName: row.specificationModel || "",
+        materialCode: row.materialCode || "",
         orderId: row.id,
         type: "order",
       },
@@ -432,9 +439,10 @@
       query: {
         orderId: row.id,
         npsNo: row.npsNo || "",
-        lotNo: row.lotNo || "",
+        batchNo: row.batchNo || "",
         productCategory: row.productCategory || "",
         specificationModel: row.specificationModel || "",
+        materialCode: row.materialCode || "",
       },
     });
   };

--
Gitblit v1.9.3