From a7cd3163cc521bb106944922ad121165a2d5ac41 Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Thu, 18 Jun 2026 15:25:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=97=A5=E6=9C=9F=E2=80=9D?= =?UTF-8?q?=E6=94=B9=E6=88=90=E4=B8=8D=E5=8F=97=E7=8A=B6=E6=80=81=E9=99=90?= =?UTF-8?q?=E5=88=B6=EF=BC=8C=E5=A7=8B=E7=BB=88=E5=8F=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../longtron/production-plan-cable-cop-task.vue | 16 ++++++++++------ .../longtron/production-plan-home-order.vue | 16 ++++++++++------ .../longtron/production-plan-machining-task.vue | 14 +++++++++----- .../production-plan-renovation-order.vue | 16 ++++++++++------ .../modules/longtron/production-work-report.vue | 12 ++++++++---- .../modules/longtron/screen-factory-overview.vue | 11 ++++------- 6 files changed, 51 insertions(+), 34 deletions(-) diff --git a/src/views/modules/longtron/production-plan-cable-cop-task.vue b/src/views/modules/longtron/production-plan-cable-cop-task.vue index 8e7310c6..fff9ccdb 100644 --- a/src/views/modules/longtron/production-plan-cable-cop-task.vue +++ b/src/views/modules/longtron/production-plan-cable-cop-task.vue @@ -63,7 +63,7 @@ @current-change="onCurrentRowChange"> @@ -183,22 +183,22 @@ label-position="top" class="edit-form"> - - + + - + - + - + - + 取消 @@ -385,6 +385,10 @@ export default { this.releaseMediaFileUrls() }, methods: { + isDateOnlyEditMode() { + const status = String(this.saveHeaderData.status || '').trim() + return !!this.saveHeaderData.orderNo && !!status && status !== '已排产' + }, getDataList(flag) { if (flag === 'Y') this.pageIndex = 1 this.searchData.page = this.pageIndex diff --git a/src/views/modules/longtron/production-plan-machining-task.vue b/src/views/modules/longtron/production-plan-machining-task.vue index 8a802555..cf68003a 100644 --- a/src/views/modules/longtron/production-plan-machining-task.vue +++ b/src/views/modules/longtron/production-plan-machining-task.vue @@ -51,7 +51,7 @@ @current-change="onCurrentRowChange"> @@ -167,12 +167,12 @@ label-position="top" class="edit-form"> - - + + - - + + @@ -407,6 +407,10 @@ export default { this.releaseMediaFileUrls() }, methods: { + isDateOnlyEditMode() { + const status = String(this.saveHeaderData.status || '').trim() + return !!this.saveHeaderData.orderNo && !!status && status !== '已排产' + }, searchTable(flag) { if (flag === 'Y') this.pageIndex = 1 this.searchData.page = this.pageIndex diff --git a/src/views/modules/longtron/production-plan-renovation-order.vue b/src/views/modules/longtron/production-plan-renovation-order.vue index 0eb677a0..9405e56b 100644 --- a/src/views/modules/longtron/production-plan-renovation-order.vue +++ b/src/views/modules/longtron/production-plan-renovation-order.vue @@ -51,7 +51,7 @@ @current-change="onCurrentRowChange"> @@ -166,12 +166,12 @@ label-position="top" class="edit-form"> - - + + - - + + @@ -205,7 +205,7 @@ --> - + 取消 @@ -382,6 +382,10 @@ export default { this.releaseMediaFileUrls() }, methods: { + isDateOnlyEditMode() { + const status = String(this.saveHeaderData.status || '').trim() + return !!this.saveHeaderData.orderNo && !!status && status !== '已排产' + }, getDataList(flag) { if (flag === 'Y') this.pageIndex = 1 this.searchData.page = this.pageIndex diff --git a/src/views/modules/longtron/production-work-report.vue b/src/views/modules/longtron/production-work-report.vue index 159f3202..d217baa2 100644 --- a/src/views/modules/longtron/production-work-report.vue +++ b/src/views/modules/longtron/production-work-report.vue @@ -428,7 +428,7 @@ export default { return this.totalPage || 0 }, pendingNodeCount () { - return this.dataList.reduce((sum, item) => sum + (item.visibleNodeList || []).filter(node => node.status !== '已完成').length, 0) + return this.dataList.reduce((sum, item) => sum + (item.visiblePendingNodeList || []).length, 0) }, reportDialogTitle () { return this.requiresMediaUpload(this.reportData.orderType, this.reportData.nodeCode, this.reportData.nodeName) ? '节点报工与影像上传' : '节点报工' @@ -481,7 +481,7 @@ export default { 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 { + const normalizedRow = { ...row, nodeReportMode: this.resolveNodeReportMode(row.orderType, row.nodeReportMode), currentNodeCode: row.currentNodeCode || fallbackCurrentNodeObj.nodeCode || '', @@ -492,8 +492,12 @@ export default { nodeDoneCount: nodeDoneCount, nodeTotalCount: nodeTotalCount, currentNode: currentNode, - visibleNodeList: nodeList, - visiblePendingNodeList: nodeList.filter(item => item.status !== '已完成') + visibleNodeList: nodeList + } + const visiblePendingNodeList = nodeList.filter(item => item.status !== '已完成' && this.canReportNode(normalizedRow, item)) + return { + ...normalizedRow, + visiblePendingNodeList: visiblePendingNodeList } }, getOrderTypeName (orderType) { diff --git a/src/views/modules/longtron/screen-factory-overview.vue b/src/views/modules/longtron/screen-factory-overview.vue index ce6ce38b..59bdaa08 100644 --- a/src/views/modules/longtron/screen-factory-overview.vue +++ b/src/views/modules/longtron/screen-factory-overview.vue @@ -31,10 +31,6 @@
近一月完工达成率
{{ kpi.finishRate }}%
-
-
当前在制总量
-
{{ kpi.wipTotal }}
-
订单准交率
{{ kpi.onTimeRate }}%
@@ -75,11 +71,11 @@ import echarts from 'echarts' import { getFactoryOverviewBoardData } from '@/api/longchuang/productionPlan' const STATUS_ALLOW_LIST = ['已排产', '进行中', '已完成'] -const KEY_NODE_NAME_ORDER = ['仓库配料', 'VL2.5组装', '检验', '打包', '线缆/COP', '机加工生产', '机加工检验'] +const KEY_NODE_NAME_ORDER = ['仓库配料', 'VL2.5组装', 'VL2.5校验', '打包', '线缆/COP', '机加工生产', '机加工检验'] const NODE_NAME_BY_CODE = { stocking: '仓库配料', assy: 'VL2.5组装', - inspect: '检验', + inspect: 'VL2.5校验', pack: '打包', lineProduction: '线缆/COP', copProduction: '线缆/COP', @@ -91,6 +87,7 @@ const NODE_NAME_BY_CODE = { } const NODE_DISPLAY_NAME_ALIAS = { 组装: 'VL2.5组装', + 检验: 'VL2.5校验', 线缆生产: '线缆/COP', COP生产: '线缆/COP' } @@ -593,7 +590,7 @@ export default { .kpi-grid { display: grid; - grid-template-columns: repeat(7, minmax(0, 1fr)); + grid-template-columns: repeat(6, minmax(0, 1fr)); gap: 14px; padding: 0 4px; margin-bottom: 14px;