From 2b2b093b6aacccfa9ec743a2d94b814ace7ca9ea Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Tue, 14 Oct 2025 10:02:19 +0800
Subject: [PATCH] =?UTF-8?q?feat(mes):=20=E6=98=BE=E7=A4=BA=E5=9C=A8?=
 =?UTF-8?q?=E5=88=B6=E5=93=81=E8=B7=9F=E8=B8=AA=E6=8A=A5=E5=91=8A=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E5=89=A9=E4=BD=99=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 启用并显示“剩余数”表格列
- 规范化数据结构，补充子节点的剩余数与完成率- 增加对计划数和已完成数的兼容字段支持
- 实现剩余数和完成率的自动计算逻辑
-优化数据处理流程以提高准确性
-修复可能因数据结构不一致导致的问题
---
 src/views/mes/wipTrackingReport/index.vue | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/views/mes/wipTrackingReport/index.vue b/src/views/mes/wipTrackingReport/index.vue
index 2aa25fc..912fd65 100644
--- a/src/views/mes/wipTrackingReport/index.vue
+++ b/src/views/mes/wipTrackingReport/index.vue
@@ -195,7 +195,7 @@
               <el-table-column label="物料名称" prop="materialName" min-width="160" show-overflow-tooltip />
               <el-table-column label="计划数" prop="planAmount" width="100" />
               <el-table-column label="已完数" prop="completeAmount" width="100" />
-              <!-- <el-table-column label="剩余数" prop="remainingAmount" width="100" /> -->
+              <el-table-column label="剩余数" prop="remainingAmount" width="100" />
               <el-table-column label="完成率" width="160">
                 <template #default="pScope">
                   <div style="display:flex;align-items:center;justify-content:flex-start;">
@@ -564,7 +564,21 @@ async function onProcessRowExpand(row: any, expanded: boolean) {
   try {
     const res: any = await processPlanList(query);
     const data = (res?.data || res?.rows || res) || [];
-    processPlansCache.value[key] = data;
+    // 规范化并补充子节点的剩余数与完成率
+    const normalized = (Array.isArray(data) ? data : []).map((it: any) => {
+      const plan = Number(it?.planAmount ?? it?.planQty ?? it?.planCount ?? 0) || 0;
+      const completed = Number(it?.completeAmount ?? it?.completedQty ?? it?.completeQty ?? it?.completedCount ?? 0) || 0;
+      const remaining = Math.max(plan - completed, 0);
+      const rate = plan > 0 ? Number(((completed * 100.0) / plan).toFixed(2)) : 0;
+      return {
+        ...it,
+        planAmount: plan,
+        completeAmount: completed,
+        remainingAmount: remaining,
+        processProgress: rate
+      };
+    });
+    processPlansCache.value[key] = normalized;
   } catch (e) {
     processPlansCache.value[key] = [];
   } finally {