From bb9a88835b5b4ed38c10577270bc07f29b6da452 Mon Sep 17 00:00:00 2001 From: zhangdi <15053473693@163.com> Date: Fri, 6 Feb 2026 13:42:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=AE=A1=E7=90=86=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/variables.scss | 2 +- .../processManagement/basicProcesses.vue | 1 + .../components/inPlantMaintenance.vue | 6 +- .../processMainte/processPlanning.vue | 9 -- .../processMainte/reworkProcessPlanning.vue | 50 +++++------ .../processManagement/inPlantProcess.vue | 1 + .../processManagement/procepssPlanning.vue | 90 ------------------- 7 files changed, 28 insertions(+), 131 deletions(-) diff --git a/src/styles/variables.scss b/src/styles/variables.scss index f2fe1b1..1bc3fe5 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1,5 +1,5 @@ // $sidebar_width: 200px; -$sidebar_width: 240px; +$sidebar_width: 220px; $sidebar_collapse: 65px; $top_height: 60px; // $top_height: 50px; diff --git a/src/views/processManagement/basicProcesses.vue b/src/views/processManagement/basicProcesses.vue index 69ee5a0..79593d8 100644 --- a/src/views/processManagement/basicProcesses.vue +++ b/src/views/processManagement/basicProcesses.vue @@ -214,6 +214,7 @@ export default { headerAlign: 'center', align: 'center', searchLabelWidth: 120, + width: 140, type: 'select', filterable:true, clearable: true, diff --git a/src/views/processManagement/components/inPlantMaintenance.vue b/src/views/processManagement/components/inPlantMaintenance.vue index 5babd22..f9b6533 100644 --- a/src/views/processManagement/components/inPlantMaintenance.vue +++ b/src/views/processManagement/components/inPlantMaintenance.vue @@ -73,7 +73,7 @@ export default { tip: false, simplePage: true, searchShow: true, - searchMenuSpan: 6, + searchMenuSpan: 12, searchIcon: true, searchIndex: 3, tree: false, @@ -142,6 +142,7 @@ export default { { label: '产线', prop: 'equipmentId', + searchLabelWidth:50, search: true, sortable: true, filter: true, @@ -166,7 +167,7 @@ export default { { label: '产线', prop: 'equipmentName', - search: true, + search: false, sortable: true, filter: true, span: 12, @@ -176,6 +177,7 @@ export default { clearable: true, addDisplay:false, editDisplay:false, + }, { diff --git a/src/views/processManagement/components/processMainte/processPlanning.vue b/src/views/processManagement/components/processMainte/processPlanning.vue index 66d8bea..39ab040 100644 --- a/src/views/processManagement/components/processMainte/processPlanning.vue +++ b/src/views/processManagement/components/processMainte/processPlanning.vue @@ -718,7 +718,6 @@ export default { let tsj = this.dictionaryData.find(item => item.dictValue == '涂箭头'); sum_ += parseInt(this.partInfoData.tsjNum) * tsj.dictKey; } - // console.log(sum_, 'sum_'); this.form1.tableData1[index].proHours = parseFloat(sum_.toFixed(2)); } }, @@ -879,9 +878,7 @@ export default { if (parentNode && parentNode.data && !parentNode.isRoot) { this.parentData = parentNode.data; // 父节点的原始数据 - console.log('父节点数据:', this.parentData); } else { - console.log('当前节点无父节点（可能是根节点）'); } this.treeLeave = node.level; @@ -954,7 +951,6 @@ export default { const node = this.contextTreeNode; const nodeId = node.data.id; - console.log('删除的节点ID:', node, nodeId); try { // 弹出确认框 await this.$confirm('此操作将删除该工艺及所有子工序，是否继续？', '警告', { @@ -962,7 +958,6 @@ export default { cancelButtonText: '取消', type: 'warning', }); - console.log('需要删除的子工序ID列表:', node); // 调用删除API（替换为你的实际API） await craftBatchRemoval({ id: node.data.id }).then(res => { this.$message.success('删除成功'); @@ -970,7 +965,6 @@ export default { }); } catch (error) { if (error !== 'cancel') { - console.error('删除失败:', error); this.$message.error('删除失败，请重试'); } } finally { @@ -980,7 +974,6 @@ export default { // 右侧tab切换 handleClick(value) { - console.log(999999, value); this.form1.deleteIds = []; this.form2.deleteIds = []; this.form3.deleteIds = []; @@ -1180,9 +1173,7 @@ export default { if (isReturn == 1) { return this.$message.warning('涂色标的工时定额必须大于0,请修改！'); } - console.log(898989, this.partInfoData); // const res = await getPartDetail(this.partId); - // console.log(res); let dsCraftMold = this.partInfoData; if (dsCraftMold.markingsTest == '1') { diff --git a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue index 985de62..fc7abe6 100644 --- a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue +++ b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue @@ -655,7 +655,7 @@ export default { standardList: [], //标准 tempId: 0, filteredList: [], - dictionaryData:[], + dictionaryData: [], }; }, mounted() { @@ -666,7 +666,7 @@ export default { this.getProject(); this.getTeamSetList(); this.getStandardList(); - this.getDictionary() + this.getDictionary(); }, methods: { // getPartList(){ @@ -674,11 +674,11 @@ export default { // this.partInfoData = res.data.data; // }); // }, - // 获取涂色标、涂色带、涂箭头的系数 - getDictionary(){ - getDictionary({code:'part_info'}).then(res=>{ - this.dictionaryData = res.data.data - }) + // 获取涂色标、涂色带、涂箭头的系数 + getDictionary() { + getDictionary({ code: 'part_info' }).then(res => { + this.dictionaryData = res.data.data; + }); }, // 获取检验项目名字 projectChange(row, index) { @@ -709,24 +709,22 @@ export default { processChange(row, index) { let selectName = this.processSetOption.find(item => item.id == row.processInfo.ppsId); this.form1.tableData1[index].processInfo.ppsName = selectName.name; - if(this.form1.tableData1[index].processName.indexOf('涂色标') > -1){ - console.log(this.partInfoData,this.dictionaryData,'this.partInfoData'); + if (this.form1.tableData1[index].processName.indexOf('涂色标') > -1) { // tsbNum 涂色标个数 tsdNum 涂色带个数 涂箭头个数 - let sum_ = 0 - if(this.partInfoData.tsbNum){ - let tsb=this.dictionaryData.find(item => item.dictValue == '涂色标') - sum_ += parseInt(this.partInfoData.tsbNum)*tsb.dictKey + let sum_ = 0; + if (this.partInfoData.tsbNum) { + let tsb = this.dictionaryData.find(item => item.dictValue == '涂色标'); + sum_ += parseInt(this.partInfoData.tsbNum) * tsb.dictKey; } - if(this.partInfoData.tsdNum){ - let tsd=this.dictionaryData.find(item => item.dictValue == '涂色带') - sum_ += parseInt(this.partInfoData.tsdNum)*tsd.dictKey + if (this.partInfoData.tsdNum) { + let tsd = this.dictionaryData.find(item => item.dictValue == '涂色带'); + sum_ += parseInt(this.partInfoData.tsdNum) * tsd.dictKey; } - if(this.partInfoData.tsjNum){ - let tsj=this.dictionaryData.find(item => item.dictValue == '涂箭头') - sum_ += parseInt(this.partInfoData.tsjNum)*tsj.dictKey + if (this.partInfoData.tsjNum) { + let tsj = this.dictionaryData.find(item => item.dictValue == '涂箭头'); + sum_ += parseInt(this.partInfoData.tsjNum) * tsj.dictKey; } - console.log(sum_,'sum_'); - this.form1.tableData1[index].proHours = sum_ + this.form1.tableData1[index].proHours = sum_; } }, // 获取工艺能力名字 @@ -825,8 +823,6 @@ export default { }, // 组织树转换 transformCraftTree(responseData) { - console.log('原始数据:', responseData); // 调试用 - const { partInfo, craftList } = responseData; const partCode = partInfo?.partCode || '未知零件'; @@ -841,8 +837,9 @@ export default { ...craft, label: `${craftInfo?.reworkOrder || '返工单'}`, children: processList.map(process => { + console.log(989898, process); const ppsName = - process.ppsName || process.name || process.processName || '未知工序'; + process.processInfo.ppsName || process.processInfo.name || process.processInfo.processName || '未知工序'; // 将 projectList 转为第四级子节点 const projectChildren = (process.projectList || []).map(project => ({ @@ -886,7 +883,6 @@ export default { if (this.treeLeave === 2) { this.activeName = '1'; this.form1.tableData1 = nodes.processList; - console.log('当前节点数据:', nodes.processList); } // 根据节点层级加载对应数据 if (this.treeLeave === 3) { @@ -903,7 +899,6 @@ export default { }, // 右侧tab切换 handleClick(value) { - // console.log(999999, value); this.form1.deleteIds = []; this.form2.deleteIds = []; this.form3.deleteIds = []; @@ -1095,7 +1090,6 @@ export default { if (this.treeLeave == 2) { this.form1.tableData1.forEach(item => { - console.log('item4444', item); newArr.push({ ...item.processInfo, processProjectVOList: item.projectList || [], @@ -1111,8 +1105,6 @@ export default { processMoldToolVOList: this.treeNodes.moldToolList || [], }); } - console.log('treeLeave', newArr); - // console.log('treeNodes', this.treeNodes); let query_ = { craft: { partId: this.partId, diff --git a/src/views/processManagement/inPlantProcess.vue b/src/views/processManagement/inPlantProcess.vue index 0a4e518..20263ef 100644 --- a/src/views/processManagement/inPlantProcess.vue +++ b/src/views/processManagement/inPlantProcess.vue @@ -205,6 +205,7 @@ export default { headerAlign: 'center', align: 'center', type: 'select', + searchLabelWidth:50, dicData: [ { value: 0, diff --git a/src/views/processManagement/procepssPlanning.vue b/src/views/processManagement/procepssPlanning.vue index aab954f..6174435 100644 --- a/src/views/processManagement/procepssPlanning.vue +++ b/src/views/processManagement/procepssPlanning.vue @@ -145,96 +145,6 @@ export default { searchMenuPosition: 'right', align: 'center', column: [ - // { - // label: '镀种', - // prop: 'partCode', - // search: true, - // sortable: true, - // overHidden: true, - // width: 210, - // hide: true, - // headerAlign: 'center', - // align: 'center', - // searchLabelWidth: 60, - // }, - // { - // label: '物料编码', - // prop: 'partCode', - // search: true, - // sortable: true, - // overHidden: true, - // width: 210, - // hide: true, - // headerAlign: 'center', - // align: 'center', - // }, - // { - // label: '子件类型', - // prop: 'partCode', - // search: true, - // sortable: true, - // overHidden: true, - // width: 210, - // hide: true, - // headerAlign: 'center', - // align: 'center', - // }, - // { - // label: '材料', - // prop: 'partCode', - // search: true, - // sortable: true, - // overHidden: true, - // width: 210, - // hide: true, - // headerAlign: 'center', - // align: 'center', - // searchLabelWidth: 60, - // }, - // { - // label: '粉重', - // prop: 'partCode', - // search: true, - // sortable: true, - // overHidden: true, - // width: 210, - // hide: true, - // headerAlign: 'center', - // align: 'center', - // searchLabelWidth: 60, - // }, - // { - // label: '成型厚度', - // prop: 'partCode', - // search: true, - // sortable: true, - // overHidden: true, - // width: 210, - // hide: true, - // headerAlign: 'center', - // align: 'center', - // }, - // { - // label: '检验项目', - // prop: 'partCode', - // search: true, - // sortable: true, - // overHidden: true, - // width: 210, - // hide: true, - // headerAlign: 'center', - // align: 'center', - // type: 'select', - // filterable:true, - // clearable: true, - // multiple: true, - // dicUrl:'/blade-desk/QA/InspectionItem/list?size=999999¤t=1', - // props: { - // label: 'name', - // value: 'id', - // res:'res.records' - // }, - // }, { label: '零件号', prop: 'partCode',