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 1aaf23a4..c124fad2 100644 --- a/src/views/modules/longtron/production-plan-cable-cop-task.vue +++ b/src/views/modules/longtron/production-plan-cable-cop-task.vue @@ -8,6 +8,7 @@ + @@ -73,7 +74,7 @@ @@ -177,7 +178,7 @@ - + - + @@ -412,8 +413,15 @@ export default { const status = String(this.saveHeaderData.status || '').trim() return !!this.saveHeaderData.orderNo && !!status && status !== '已排产' }, + getTaskTypeTagType(taskType) { + if (taskType === '线缆自制') return 'primary' + if (taskType === 'COP自制') return 'success' + if (taskType === '其他' || taskType === '其它') return 'info' + return 'warning' + }, getExpectedNodeCodeByTaskType(taskType) { const text = (taskType || '').trim() + if (text.includes('其他') || text.includes('其它')) return 'otherProduction' if (text.includes('线缆')) return 'lineProduction' if (text.toUpperCase().includes('COP')) return 'copProduction' return '' @@ -422,6 +430,7 @@ export default { const nodeCode = this.getExpectedNodeCodeByTaskType(taskType) if (nodeCode === 'lineProduction') return '线缆生产' if (nodeCode === 'copProduction') return 'COP生产' + if (nodeCode === 'otherProduction') return '其他' return '' }, getDefaultNodeListByTaskType(taskType) { @@ -430,7 +439,8 @@ export default { if (!nodeCode || !nodeName) { return [ { nodeCode: 'lineProduction', nodeName: '线缆生产', status: '未开始' }, - { nodeCode: 'copProduction', nodeName: 'COP生产', status: '未开始' } + { nodeCode: 'copProduction', nodeName: 'COP生产', status: '未开始' }, + { nodeCode: 'otherProduction', nodeName: '其他', status: '未开始' } ] } return [{ nodeCode: nodeCode, nodeName: nodeName, status: '未开始' }] @@ -577,8 +587,8 @@ export default { if (row.action && row.action !== '报工完成') { return false } - const codeSet = ['lineProduction', 'copProduction'] - const nameSet = ['线缆生产', 'COP生产'] + const codeSet = ['lineProduction', 'copProduction', 'otherProduction'] + const nameSet = ['线缆生产', 'COP生产', '其他'] const nodeCode = String(row.nodeCode || '').trim() const nodeName = String(row.nodeName || '').replace(/\s+/g, '') return codeSet.includes(nodeCode) || nameSet.some(item => item.replace(/\s+/g, '') === nodeName) @@ -848,7 +858,7 @@ export default { this.$message.error(errorMsg) return } - const fileName = this.resolveExportFileName(response, '线缆COP任务单') + const fileName = this.resolveExportFileName(response, '部件任务单') this.downloadExportFile(response.data, fileName) this.$message.success('导出成功') } catch (e) { diff --git a/src/views/modules/longtron/production-report-cancel.vue b/src/views/modules/longtron/production-report-cancel.vue index 9b671278..0e840639 100644 --- a/src/views/modules/longtron/production-report-cancel.vue +++ b/src/views/modules/longtron/production-report-cancel.vue @@ -7,7 +7,7 @@ - + @@ -117,7 +117,7 @@ export default { getOrderTypeName(orderType) { const map = { HOME_LIFT: '家用电梯', - CABLE_COP: '线缆/COP', + CABLE_COP: '部件', RENOVATION: '改造项目', MACHINING: '机加工生产' } diff --git a/src/views/modules/longtron/production-work-report.vue b/src/views/modules/longtron/production-work-report.vue index 2ed79fcc..a706aaea 100644 --- a/src/views/modules/longtron/production-work-report.vue +++ b/src/views/modules/longtron/production-work-report.vue @@ -5,7 +5,7 @@

生产报工

-

家用电梯 / 线缆COP / 改造项目 / 机加工节点报工管理

+

家用电梯 / 部件 / 改造项目 / 机加工节点报工管理

@@ -42,7 +42,7 @@ - + @@ -509,7 +509,7 @@ export default { getOrderTypeName (orderType) { const map = { HOME_LIFT: '家用电梯', - CABLE_COP: '线缆COP', + CABLE_COP: '部件', RENOVATION: 'VL2.5升级', MACHINING: '机加工生产' } diff --git a/src/views/modules/longtron/screen-factory-overview.vue b/src/views/modules/longtron/screen-factory-overview.vue index d2c534d8..6b112dd5 100644 --- a/src/views/modules/longtron/screen-factory-overview.vue +++ b/src/views/modules/longtron/screen-factory-overview.vue @@ -20,7 +20,7 @@
{{ kpi.renovationFinishRate }}%
-
线缆/COP完工比
+
部件完工比
{{ kpi.taskFinishRate }}%
@@ -71,14 +71,15 @@ import echarts from 'echarts' import { getFactoryOverviewBoardData } from '@/api/longchuang/productionPlan' const STATUS_ALLOW_LIST = ['已排产', '进行中', '已完成'] -const KEY_NODE_NAME_ORDER = ['仓库配料', 'VL2.5组装', 'VL2.5校验', '打包', '线缆/COP', '机加工生产', '机加工检验'] +const KEY_NODE_NAME_ORDER = ['仓库配料', 'VL2.5组装', 'VL2.5校验', '打包', '部件', '机加工生产', '机加工检验'] const NODE_NAME_BY_CODE = { stocking: '仓库配料', assy: 'VL2.5组装', inspect: 'VL2.5校验', pack: '打包', - lineProduction: '线缆/COP', - copProduction: '线缆/COP', + lineProduction: '部件', + copProduction: '部件', + otherProduction: '部件', machiningProduction: '机加工生产', machiningInspection: '机加工检验', platformDebug: '平台组装/调试', @@ -88,8 +89,9 @@ const NODE_NAME_BY_CODE = { const NODE_DISPLAY_NAME_ALIAS = { 组装: 'VL2.5组装', 检验: 'VL2.5校验', - 线缆生产: '线缆/COP', - COP生产: '线缆/COP' + 线缆生产: '部件', + COP生产: '部件', + 其他: '部件' } const AVERAGE_CYCLE_CATEGORY_LIST = [ { key: 'VW', name: 'VW', orderType: 'HOME_LIFT' }, @@ -347,7 +349,7 @@ export default { } }, legend: { textStyle: { color: '#cbe7ff', fontSize: 13 }, data: ['完工比'] }, - xAxis: { type: 'category', axisLabel: { color: '#cbe7ff', fontSize: 13 }, data: ['整梯', 'VL2.5升级', '线缆/COP', '机加工'] }, + xAxis: { type: 'category', axisLabel: { color: '#cbe7ff', fontSize: 13 }, data: ['整梯', 'VL2.5升级', '部件', '机加工'] }, yAxis: { type: 'value', min: 0, @@ -386,7 +388,7 @@ export default { const pieData = [ { value: wholeCount, name: '整梯订单' }, { value: renovationCount, name: 'VL2.5升级订单' }, - { value: taskCount, name: '线缆/COP任务' }, + { value: taskCount, name: '部件任务' }, { value: machiningCount, name: '机加工任务' } ] this.chartPie.setOption({ diff --git a/src/views/modules/longtron/screen-renovation-progress.vue b/src/views/modules/longtron/screen-renovation-progress.vue index 6c7962c2..33576003 100644 --- a/src/views/modules/longtron/screen-renovation-progress.vue +++ b/src/views/modules/longtron/screen-renovation-progress.vue @@ -3,7 +3,7 @@
-
生产进度管理看板 · VL2.5升级/线缆COP/机加工
+
生产进度管理看板 · VL2.5升级/部件/机加工
{{ currentTime }} @@ -19,7 +19,7 @@
-
线缆/COP任务
+
部件任务
{{ cableCopKpi.finishRate }}% 完工达成率 @@ -61,7 +61,7 @@
- 线缆/COP任务进度 + 部件任务进度 第 {{ cableCopPage + 1 }}/{{ cableCopPageCount }} 页 · 显示 {{ displayCableCopList.length }} / 共 {{ cableCopList.length }} 条
@@ -120,7 +120,7 @@ import { getScreenInnerHeight } from '@/utils/screenAdapt' const STATUS_ALLOW_LIST = ['已排产', '进行中', '已完成'] const STATUS_EXCLUDE_FROM_LIST = ['已完成'] const RENOVATION_NODE_TEMPLATE = ['stocking', 'assy', 'inspect', 'pack'] -const CABLE_COP_NODE_TEMPLATE = ['lineProduction', 'copProduction'] +const CABLE_COP_NODE_TEMPLATE = ['lineProduction', 'copProduction', 'otherProduction'] const MACHINING_NODE_TEMPLATE = ['machiningProduction', 'machiningInspection'] const BOARD_PAGE_SIZE = 6 @@ -336,6 +336,7 @@ export default { getTaskTypeClass(taskType) { if (taskType === '线缆自制') return 'type-cable' if (taskType === 'COP自制') return 'type-cop' + if (taskType === '其他' || taskType === '其它') return 'type-other' return 'type-default' }, getStatusTagClass(status) { @@ -403,6 +404,7 @@ export default { .board-tag{display:inline-flex!important;align-items:center!important;justify-content:center!important;min-width:88px!important;height:29px!important;padding:0 10px!important;border-radius:14px!important;border:1px solid transparent!important;font-size:14px!important;font-weight:600!important;line-height:27px!important;box-sizing:border-box!important} .board-tag.type-cable{color:#73cfff!important;background:rgba(28,88,136,.32)!important;border-color:rgba(115,207,255,.45)!important} .board-tag.type-cop{color:#7ef0c0!important;background:rgba(31,108,89,.32)!important;border-color:rgba(126,240,192,.45)!important} +.board-tag.type-other{color:#c8d5ff!important;background:rgba(71,82,129,.34)!important;border-color:rgba(200,213,255,.45)!important} .board-tag.type-default{color:#d0e5f9!important;background:rgba(80,118,149,.28)!important;border-color:rgba(208,229,249,.34)!important} .board-tag.status-planned{color:#b9c7d8!important;background:rgba(96,118,141,.28)!important;border-color:rgba(185,199,216,.34)!important} .board-tag.status-doing{color:#ffd774!important;background:rgba(120,92,27,.32)!important;border-color:rgba(255,215,116,.45)!important}