From 0974cda1344e6367a6f7cbc540c7c7ae1034b0f3 Mon Sep 17 00:00:00 2001 From: zhangdi <1104545947@qq.com> Date: Thu, 26 Mar 2026 16:58:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/processMainte/partDetails.vue | 18 +++++++++++------- .../processMainte/processPlanning.vue | 6 ++---- .../processMainte/reworkProcessPlanning.vue | 10 ++++++++++ .../processManagement/procepssPlanning.vue | 10 ++++++++++ .../qualityManagement/similarParts/index.vue | 3 ++- 5 files changed, 35 insertions(+), 12 deletions(-) diff --git a/src/views/processManagement/components/processMainte/partDetails.vue b/src/views/processManagement/components/processMainte/partDetails.vue index cecfeaf..0220c6f 100644 --- a/src/views/processManagement/components/processMainte/partDetails.vue +++ b/src/views/processManagement/components/processMainte/partDetails.vue @@ -482,6 +482,7 @@ @node-click="handleNodeClick" :default-expand-all="true" :expand-on-click-node="false" + ref="tree" />
@@ -491,7 +492,7 @@ - + @@ -823,15 +824,14 @@ export default { }, // 组织树点击 handleNodeClick(nodes, node, self) { + console.log(9999999,nodes,node) if (nodes.disabled) { return false; } this.treeNodes = nodes; this.treeLeave = node.level; - if(this.treeNodes.rawData.prority){ - this.treeNodes.rawData.prority = this.treeNodes.rawData.prority+''; - } + // 清空现有表格数据 this.form1.tableData1 = []; @@ -842,6 +842,8 @@ export default { if (this.treeLeave === 2) { this.activeName = '1'; this.form1.tableData1 = nodes.processList; + console.log('默认点击选中第一个数据') + this.treeNodes.rawData.prority = this.treeNodes.rawData.prority+''; } // 根据节点层级加载对应数据 if (this.treeLeave === 3) { @@ -932,6 +934,7 @@ export default { getProcessManagementAuthorized(query).then(res => { this.data = this.transformCraftTree(res.data.data); this.tabLoading = false; + this.autoSelectFirstNode(); }); } else if (this.detailsType === 'taskProcessing') { let query_ = {}; @@ -955,6 +958,7 @@ export default { this.craftData = res.data.data; this.data = this.transformCraftTree(res.data.data); this.tabLoading = false; + this.autoSelectFirstNode(); }); } }, @@ -1061,7 +1065,7 @@ export default { return { ...processInfo, id: generateId('process', processInfo.id, processInfo.processNo), - label: processInfo.processName || '未知工序', + label: processInfo.processNo+'-'+processInfo.processName, level: 3, rawData: { processInfo, @@ -1072,7 +1076,7 @@ export default { // ✅ 子节点（项目） children: (projectList || []).map(project => ({ id: generateId('project', project.id, project.projectCode), - label: project.projectName || '未知项目', + label: project.trialNo+'-'+project.projectName, level: 4, disabled: true, rawData: project, diff --git a/src/views/processManagement/components/processMainte/processPlanning.vue b/src/views/processManagement/components/processMainte/processPlanning.vue index a7dc140..04bdd2a 100644 --- a/src/views/processManagement/components/processMainte/processPlanning.vue +++ b/src/views/processManagement/components/processMainte/processPlanning.vue @@ -980,7 +980,7 @@ export default { return { ...processInfo, id: generateId('process', processInfo.id, processInfo.processNo), - label: processInfo.processName || '未知工序', + label: processInfo.processNo+'-'+processInfo.processName, level: 3, rawData: { processInfo, @@ -991,7 +991,7 @@ export default { // ✅ 子节点（项目） children: (projectList || []).map(project => ({ id: generateId('project', project.id, project.projectCode), - label: project.projectName || '未知项目', + label: project.trialNo+'-'+project.projectName || '未知项目', level: 4, disabled: true, rawData: project, @@ -1190,13 +1190,11 @@ export default { }); } if (this.activeName == '3') { - console.log('this.form3.tableData3', this.treeNodes); let trialNo_ = ''; if (this.treeNodes.children.length <= 0) { trialNo_ = this.treeNodes.processNo; }else{ let projectInfo = this.treeNodes.children.filter(item => item.rawData.projectName.indexOf('尺寸检测')>-1); - console.log('projectInfo', projectInfo); if(projectInfo.length>0){ trialNo_ = projectInfo[0].rawData.trialNo; }else{ diff --git a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue index 1840020..b69380c 100644 --- a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue +++ b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue @@ -1268,4 +1268,14 @@ export default { height: 36px !important; /* 设置你想要的高度 */ line-height: 36px !important; } +:deep(.el-tree-node.is-current > .el-tree-node__content) { + background-color: rgba(40, 76, 135, 0.9) !important; + + .el-tree-node__label { + color: #fff; + } +} +:deep(.el-tree-node__label) { + font-size: 14px; +} diff --git a/src/views/processManagement/procepssPlanning.vue b/src/views/processManagement/procepssPlanning.vue index c016558..705d47f 100644 --- a/src/views/processManagement/procepssPlanning.vue +++ b/src/views/processManagement/procepssPlanning.vue @@ -189,6 +189,16 @@ export default { }, ], }, + { + label: '镀种', + prop: 'plate', + sortable: true, + search: false, + overHidden: true, + headerAlign: 'center', + align: 'center', + width: 250, + }, { label: '工艺路线', diff --git a/src/views/qualityManagement/similarParts/index.vue b/src/views/qualityManagement/similarParts/index.vue index 679c9b1..8401487 100644 --- a/src/views/qualityManagement/similarParts/index.vue +++ b/src/views/qualityManagement/similarParts/index.vue @@ -220,6 +220,7 @@ export default { closeDialog() { this.isRushOpen = false; this.isBatchOpen = false; + this.onLoad(this.page,this.query); }, inBatchesFn(row) { this.rowItem = row; @@ -264,7 +265,7 @@ export default { rowSave(row, done, loading) { add(row).then( () => { - this.onLoad(this.page); + this.onLoad(this.page,this.query); this.$message({ type: 'success', message: '操作成功!',