From f84e425bb9debb5f2af8e417bf07d2a2b0077609 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 28 四月 2026 17:00:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro
---
src/views/productionManagement/productionReporting/index.vue | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index 6b543e7..8490b85 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -163,6 +163,11 @@
width: 120,
},
{
+ label: "宸ュ簭",
+ prop: "process",
+ width: 120,
+ },
+ {
label: "宸ュ崟缂栧彿",
prop: "workOrderNo",
width: 120,
@@ -187,11 +192,11 @@
prop: "quantity",
width: 120,
},
- // {
- // label: "鎶ュ簾鏁伴噺",
- // prop: "scrapQuantity",
- // width: 120,
- // },
+ {
+ label: "鎶ュ簾鏁伴噺",
+ prop: "scrapQty",
+ width: 120,
+ },
{
label: "鍗曚綅",
prop: "unit",
@@ -412,4 +417,8 @@
});
</script>
-<style scoped></style>
+<style scoped>
+.table_list {
+ margin-top: unset;
+}
+</style>
--
Gitblit v1.9.3