From adebde4b07b260f8165b49858227e0711b72167a Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 30 Apr 2025 17:06:13 +0800 Subject: [PATCH] =?UTF-8?q?2025-04-30=20=E5=AE=9A=E6=97=B6=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E8=B4=A8=E9=87=8F=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/eam_object_list.js | 3 ++- .../modules/eam/eamWorkOrderForCheck.vue | 23 ------------------- .../modules/eam/eamWorkOrderForDefect.vue | 2 +- src/views/modules/qc/IPQCResultEntry.vue | 9 -------- .../reportWorkOrder/reportDefectOrder.vue | 21 ++++++++++++++++- 5 files changed, 23 insertions(+), 35 deletions(-) diff --git a/src/api/eam/eam_object_list.js b/src/api/eam/eam_object_list.js index b15a2f1..4a9e649 100644 --- a/src/api/eam/eam_object_list.js +++ b/src/api/eam/eam_object_list.js @@ -8,7 +8,8 @@ export const getFileContentList = data => createAPI('sys/file/getSysFileByOrderR export const getDevicePartList = data => createAPI('pms/resourcespare/getResourceSpareListByResourceId','post',data) /*查询设备的核心备件清单*/ export const getDeviceCorePartList = data => createAPI('pms/resourcespare/getDeviceCorePartList','post',data) - +// 查询核心备件清单 +export const getDeviceCorePartListAll = data => createAPI('pms/resourcespare/getDeviceCorePartListAll','post',data) /*查询设备的点检项目列表*/ export const getCheckItemList = data => createAPI('pms/eamObject/getCheckItemList','post',data) /*查询设备的维保项目列表*/ diff --git a/src/views/modules/eam/eamWorkOrderForCheck.vue b/src/views/modules/eam/eamWorkOrderForCheck.vue index d8fe274..fa3f5e1 100644 --- a/src/views/modules/eam/eamWorkOrderForCheck.vue +++ b/src/views/modules/eam/eamWorkOrderForCheck.vue @@ -1499,15 +1499,6 @@ }, cancelOrder2 () { - // let obj = document.getElementsByName('addWorkOrderRule') - // let s = '' - // for (let i = 0; i < obj.length; i++) { - // if (obj[i].checked) { - // s += obj[i].value + ',' - // } - // } - // s = s.substring(0,s.length-1) - // this.cancelData.cancelAll = s if (this.cancelData.cancelAll === 'Y') { this.$confirm(`是否取消该计划设备的所有工单?`, '提示', { confirmButtonText: '确定', @@ -1745,12 +1736,6 @@ case 2: this.columnDetailList = data.rows break; - // case 3: - // this.columnList2 = data.rows - // break; - // case 4: - // this.columnList3 = data.rows - // break; } } else { this.getColumnList(tableId, columnId) @@ -1774,15 +1759,7 @@ case 2: this.columnDetailList = data.rows break; - // case 3: - // this.columnList2 = data.rows - // break; - // case 4: - // this.columnList3 = data.rows - // break; } - } else { - // this.showDefault = true. } }) }, diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue index 25dda2d..3964841 100644 --- a/src/views/modules/eam/eamWorkOrderForDefect.vue +++ b/src/views/modules/eam/eamWorkOrderForDefect.vue @@ -2570,7 +2570,7 @@ export default { orderNo: this.detailData.orderNo, } getDeviceCorePartList(tempData).then(({data}) => { - if (data && data.code === 200) { + if (data && data.code === 0) { this.corePartSpareList = data.rows } else { this.corePartSpareList = [] diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index 69aa58c..7e2172b 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -4045,7 +4045,6 @@ } await getTableUserListLanguage(queryTableUser).then(({data}) => { if (data.rows.length > 0) { - //this.columnList1 = [] switch (columnId) { case 1: this.columnList1 = data.rows @@ -4056,9 +4055,6 @@ case 3: this.seqDetailColumnList = data.rows break; - // case 4: - // this.columnList3 = data.rows - // break; } } else { this.getColumnList(tableId, columnId) @@ -4085,12 +4081,7 @@ case 3: this.seqDetailColumnList = data.rows break; - // case 4: - // this.columnList3 = data.rows - // break; } - } else { - // this.showDefault = true. } }) }, diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue index 950f4a2..08f0731 100644 --- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue +++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue @@ -709,6 +709,7 @@ } from "@/api/eam/eam.js" import { downLoadObjectFile, + getDeviceCorePartListAll, getDeviceCorePartList, getDevicePartList, getKnowledgeBaseList, @@ -749,6 +750,7 @@ orderNo: '' }, corePartSpareList: [], + corePartSpareListAll: [], coreComponentData: { site: '', orderNo: '', @@ -2687,6 +2689,23 @@ this.authReport = !reportFlag }, + // 获取核心备件列表 + getCorePartSpareListAll () { + let tempData = { + site: this.saveData.site, + buNo: this.saveData.buNo, + objectID: this.saveData.objectID, + orderNo: this.saveData.orderNo, + } + getDeviceCorePartList(tempData).then(({data}) => { + if (data && data.code === 0) { + this.corePartSpareListAll = data.rows + } else { + this.corePartSpareListAll = [] + } + }) + }, + getCorePartSpareList () { let tempData = { site: this.saveData.site, @@ -2695,7 +2714,7 @@ orderNo: this.saveData.orderNo, } getDeviceCorePartList(tempData).then(({data}) => { - if (data && data.code === 200) { + if (data && data.code === 0) { this.corePartSpareList = data.rows } else { this.corePartSpareList = []