From c7b77f17e443124bf3080cde2e1c0d40a3ededb5 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 22 一月 2026 15:23:57 +0800
Subject: [PATCH] fix: 同步升级报废功能

---
 src/views/productionManagement/productionReporting/index.vue |   10 +++++-----
 src/views/productionManagement/workOrder/index.vue           |    8 ++++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index 6b543e7..08b515d 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -187,11 +187,11 @@
       prop: "quantity",
       width: 120,
     },
-    // {
-    //   label: "鎶ュ簾鏁伴噺",
-    //   prop: "scrapQuantity",
-    //   width: 120,
-    // },
+    {
+      label: "鎶ュ簾鏁伴噺",
+      prop: "scrapQty",
+      width: 120,
+    },
     {
       label: "鍗曚綅",
       prop: "unit",
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index f5d2bc1..de91893 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -180,6 +180,13 @@
                     style="width: 300px"
                     placeholder="璇疯緭鍏ユ湰娆$敓浜ф暟閲�" />
         </el-form-item>
+        <el-form-item label="鎶ュ簾鏁伴噺">
+          <el-input v-model.number="reportForm.scrapQty"
+                    type="number"
+                    min="1"
+                    style="width: 300px"
+                    placeholder="璇疯緭鍏ユ姤搴熸暟閲�" />
+        </el-form-item>
         <el-form-item label="鐝粍淇℃伅">
           <el-select v-model="reportForm.userId"
                      style="width: 300px"
@@ -427,6 +434,7 @@
     reportForm.workOrderId = row.id;
     reportForm.reportWork = row.reportWork;
     reportForm.productMainId = row.productMainId;
+    reportForm.scrapQty = row.scrapQty;
     // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛淇℃伅锛岃缃负榛樿閫変腑
     getUserProfile()
       .then(res => {

--
Gitblit v1.9.3