From 52a82ae7364bb333efdc0ae10df91e1cbc69b9de Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 13 六月 2026 19:55:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁
---
src/views/productionManagement/workOrderManagement/index.vue | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/views/productionManagement/workOrderManagement/index.vue b/src/views/productionManagement/workOrderManagement/index.vue
index b0ba941..b2ac432 100644
--- a/src/views/productionManagement/workOrderManagement/index.vue
+++ b/src/views/productionManagement/workOrderManagement/index.vue
@@ -423,7 +423,7 @@
const reportForm = reactive({
planQuantity: 0,
quantity: null,
- scrapQty: null,
+ scrapQty: 0,
userName: "",
workOrderId: "",
reportWork: "",
@@ -669,10 +669,8 @@
reportForm.workOrderId = row.id;
reportForm.reportWork = row.reportWork;
reportForm.productMainId = row.productMainId;
- reportForm.scrapQty =
- row.scrapQty !== undefined && row.scrapQty !== null ? row.scrapQty : null;
- reportForm.productionOrderRoutingOperationId =
- row.productionOrderRoutingOperationId;
+ reportForm.scrapQty = 0;
+ reportForm.productionOrderRoutingOperationId = row.productionOrderRoutingOperationId;
reportForm.productionOrderId = row.productionOrderId;
if (row.type == 0) {
reportForm.workHour = row.workHour || 0;
--
Gitblit v1.9.3