From c05b81c7f50df80ab247a05f9f92af2d799e77cd Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 10 四月 2026 15:59:04 +0800
Subject: [PATCH] feat:1.销售添加是否生产 2.生产订单添加备注

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

diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 7018d63..887b6f7 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',
     },
     {
@@ -203,6 +208,11 @@
       label: "浜や粯鏃ユ湡",
       prop: "deliveryDate",
       formatData: val => (val ? dayjs(val).format("YYYY-MM-DD") : ""),
+      width: 120,
+    },
+    {
+      label: "澶囨敞",
+      prop: "remark",
       width: 120,
     },
     {
@@ -399,6 +409,7 @@
           processRouteCode: data.processRouteCode || "",
           productName: data.productName || "",
           model: data.model || "",
+          materialCode: data.materialCode || "",
           bomNo: data.bomNo || "",
           description: data.description || "",
           orderId,
@@ -419,6 +430,7 @@
         bomNo: row.bomNo || "",
         productName: row.productCategory || "",
         productModelName: row.specificationModel || "",
+        materialCode: row.materialCode || "",
         orderId: row.id,
         type: "order",
       },
@@ -432,9 +444,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