From d7ce3f9f14f1d9db24090db0af26d1f7d5024565 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 25 二月 2025 09:17:15 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
index 29a12ed..f4d9e3f 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
@@ -73,7 +73,7 @@
res.data.data.forEach(item => {
item.reportWorkQuantity = JSON.parse(item.reportWorkQuantity)
item.reportWorkQuantityCount = JSON.parse(item.reportWorkQuantityCount)
- item.reportWorkTime = JSON.parse(item.reportWorkTime)
+ //item.reportWorkTime = JSON.parse(item.reportWorkTime)
})
mergeCells.value = res.data.mergeCell
xGrid.value.loadData(res.data.data)
--
Gitblit v1.8.0