From 29f314752b4654b9a1baaed58cd3c6c40317f5ee Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Wed, 22 Apr 2026 13:42:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=8A=A5=E5=B7=A5=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E5=8F=AF=E4=BB=A5=E9=80=89=E6=8B=A9=E5=B9=B6=E8=A1=8C?= =?UTF-8?q?=E8=BF=98=E6=98=AF=E6=8C=89=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/longchuang/production-work-report.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/views/modules/longchuang/production-work-report.vue b/src/views/modules/longchuang/production-work-report.vue index a4b5206e..8d18e700 100644 --- a/src/views/modules/longchuang/production-work-report.vue +++ b/src/views/modules/longchuang/production-work-report.vue @@ -327,17 +327,21 @@ export default { }, normalizeOrderRow(row) { const nodeList = row.nodeList || [] - const nodeDoneCount = nodeList.filter(item => item.status === '已完成').length - const currentNode = (nodeList.find(item => item.status !== '已完成') || {}).nodeName || '全部完成' + const fallbackNodeDoneCount = nodeList.filter(item => item.status === '已完成').length + const fallbackCurrentNodeObj = nodeList.find(item => item.status !== '已完成') || {} + const nodeDoneCount = typeof row.nodeDoneCount === 'number' ? row.nodeDoneCount : fallbackNodeDoneCount + const nodeTotalCount = typeof row.nodeTotalCount === 'number' ? row.nodeTotalCount : nodeList.length + const currentNode = row.currentNode || fallbackCurrentNodeObj.nodeName || '全部完成' return { ...row, nodeReportMode: row.nodeReportMode || 'PARALLEL', + currentNodeCode: row.currentNodeCode || fallbackCurrentNodeObj.nodeCode || '', orderTypeName: this.getOrderTypeName(row.orderType), productName: row.taskNo || row.projectNo || '-', planDate: row.planFinishDate || row.planDeliveryDate || '-', owner: this.$store.state.user.userDisplay || this.$store.state.user.name || '-', nodeDoneCount: nodeDoneCount, - nodeTotalCount: nodeList.length, + nodeTotalCount: nodeTotalCount, currentNode: currentNode, visibleNodeList: nodeList } @@ -402,9 +406,7 @@ export default { if ((order.nodeReportMode || 'PARALLEL') !== 'SEQUENTIAL') { return true } - const nodeList = order.visibleNodeList || [] - const firstUnDoneNode = nodeList.find(item => item.status !== '已完成') - return !!firstUnDoneNode && firstUnDoneNode.nodeCode === node.nodeCode + return !!order.currentNodeCode && order.currentNodeCode === node.nodeCode }, directReportNode(order, node) { this.reportData = {