From 52df5ea2e61a5f466f7b356bcfb3cf77b4d2e8cc Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 24 三月 2026 15:56:01 +0800
Subject: [PATCH] Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-inventory-management into dev_长治_健齿齿科器材

---
 src/views/productionManagement/productionReporting/index.vue |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index 6b543e7..af06fe5 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -163,13 +163,13 @@
       width: 120,
     },
     {
-      label: "宸ュ崟缂栧彿",
-      prop: "workOrderNo",
+      label: "宸ュ簭",
+      prop: "process",
       width: 120,
     },
     {
-      label: "閿�鍞悎鍚屽彿",
-      prop: "salesContractNo",
+      label: "宸ュ崟缂栧彿",
+      prop: "workOrderNo",
       width: 120,
     },
     {
@@ -187,11 +187,11 @@
       prop: "quantity",
       width: 120,
     },
-    // {
-    //   label: "鎶ュ簾鏁伴噺",
-    //   prop: "scrapQuantity",
-    //   width: 120,
-    // },
+    {
+      label: "鎶ュ簾鏁伴噺",
+      prop: "scrapQty",
+      width: 120,
+    },
     {
       label: "鍗曚綅",
       prop: "unit",

--
Gitblit v1.9.3