From 63afcf7bd6eff23e4feee8b6d12053bd8e78abb8 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 09 五月 2026 17:38:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

---
 src/views/productionManagement/productionCosting/index.vue |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/views/productionManagement/productionCosting/index.vue b/src/views/productionManagement/productionCosting/index.vue
index c4563dd..3e79b93 100644
--- a/src/views/productionManagement/productionCosting/index.vue
+++ b/src/views/productionManagement/productionCosting/index.vue
@@ -125,6 +125,11 @@
       minWidth: 100,
     },
     {
+      label: "宸ユ椂锛坔锛�",
+      prop: "workHour",
+      minWidth: 100,
+    },
+    {
       label: "鐢熶骇鏁伴噺",
       prop: "quantity",
       minWidth: 100,
@@ -164,7 +169,7 @@
       minWidth: 100,
       formatData: val => {
         if (val == null || val === "") return "-";
-        return parseFloat(val).toFixed(2);
+        return parseFloat(val).toFixed(2) + "%";
       },
     },
   ]);

--
Gitblit v1.9.3