diff --git a/src/api/eam/eam.js b/src/api/eam/eam.js index 6bfdbfc..8483dcc 100644 --- a/src/api/eam/eam.js +++ b/src/api/eam/eam.js @@ -232,3 +232,4 @@ export const getInventoryStockList= data => createAPI(`/pms/eam/getInventoryStoc */ export const saveTrans= data => createAPI(`/pms/eam/saveTrans`,'post',data) +export const saveCoreComponent= data => createAPI(`/pms/eam/saveCoreComponent`,'post',data) diff --git a/src/views/modules/reportWorkOrder/reportCheckOrder.vue b/src/views/modules/reportWorkOrder/reportCheckOrder.vue index aedfbd3..c320821 100644 --- a/src/views/modules/reportWorkOrder/reportCheckOrder.vue +++ b/src/views/modules/reportWorkOrder/reportCheckOrder.vue @@ -713,6 +713,78 @@ fixed: '', columnWidth: 80, }, + { + userId: this.$store.state.user.name, + functionId: 101002005, + serialNumber: '101002005Table1CorePartNo', + tableId: "101002005Table1", + tableName: "维修执行表", + columnProp: 'corePartNo', + headerAlign: "center", + align: "center", + columnLabel: '更换配件编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100, + }, + { + userId: this.$store.state.user.name, + functionId: 101002005, + serialNumber: '101002005Table1CorePartDescription', + tableId: "101002005Table1", + tableName: "维修执行表", + columnProp: 'corePartDescription', + headerAlign: "center", + align: "left", + columnLabel: '更换配件名称', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100, + }, + { + userId: this.$store.state.user.name, + functionId: 101002005, + serialNumber: '101002005Table1OldSerialNo', + tableId: "101002005Table1", + tableName: "维修执行表", + columnProp: 'oldSerialNo', + headerAlign: "center", + align: "left", + columnLabel: '老序列号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120, + }, + { + userId: this.$store.state.user.name, + functionId: 101002005, + serialNumber: '101002005Table1NewSerialNo', + tableId: "101002005Table1", + tableName: "维修执行表", + columnProp: 'newSerialNo', + headerAlign: "center", + align: "left", + columnLabel: '新序列号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120, + }, ], detailModelFlag: false, detailList: [], diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue index dd23c4e..c87938e 100644 --- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue +++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue @@ -201,6 +201,9 @@ 备件图片 + + 核心配件 + @@ -437,6 +440,36 @@ + + + + + + + + + + + + + + + + + + + + + + 保存 + 关闭 + + +
@@ -534,6 +567,7 @@ deleteObjectFile, getInventoryStockList, // 获取领用出库信息 saveTrans, // 维修出库 + saveCoreComponent, } from "@/api/eam/eam.js" import {downLoadObjectFile, getDevicePartList} from '@/api/eam/eam_object_list.js'; import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" @@ -563,12 +597,24 @@ }, data () { return { + coreComponentFlag: false, uploadDialog: false, uploadData: { folder: '', title: '', orderNo: '' }, + coreComponentData:{ + site:'', + orderNo:'', + buNo:'', + objectID:'', + partNo:'', + partDescription:'', + createdBy:'', + oldSerialNo:'', + newSerialNo:'', + }, fileData: { file: [], orderRef1: '', @@ -853,6 +899,78 @@ fixed: '', columnWidth: 107, }, + { + userId: this.$store.state.user.name, + functionId: 101004003, + serialNumber: '101004003Table1CorePartNo', + tableId: "101004003Table1", + tableName: "维修执行表", + columnProp: 'corePartNo', + headerAlign: "center", + align: "center", + columnLabel: '更换配件编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100, + }, + { + userId: this.$store.state.user.name, + functionId: 101004003, + serialNumber: '101004003Table1CorePartDescription', + tableId: "101004003Table1", + tableName: "维修执行表", + columnProp: 'corePartDescription', + headerAlign: "center", + align: "left", + columnLabel: '更换配件名称', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100, + }, + { + userId: this.$store.state.user.name, + functionId: 101004003, + serialNumber: '101004003Table1OldSerialNo', + tableId: "101004003Table1", + tableName: "维修执行表", + columnProp: 'oldSerialNo', + headerAlign: "center", + align: "left", + columnLabel: '老序列号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120, + }, + { + userId: this.$store.state.user.name, + functionId: 101004003, + serialNumber: '101004003Table1NewSerialNo', + tableId: "101004003Table1", + tableName: "维修执行表", + columnProp: 'newSerialNo', + headerAlign: "center", + align: "left", + columnLabel: '新序列号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120, + }, ], detailModelFlag: false, detailList: [], @@ -1841,7 +1959,11 @@ feedBackDesc: row.feedBackDesc, faultReason: row.faultReason, preventiveMeasure: row.preventiveMeasure, - result: row.result + result: row.result, + corePartNo:row.corePartNo, + corePartDescription:row.corePartDescription, + oldSerialNo:row.oldSerialNo, + newSerialNo:row.newSerialNo, } this.activeTable = 'inspection_form' this.queryHistoryRecord() @@ -2230,6 +2352,50 @@ this.authReach = !reachFlag this.authReport = !reportFlag }, + coreComponentModal(){ + this.getPartSpareList(); + this.coreComponentData={ + site:this.saveData.site, + buNo:this.saveData.buNo, + orderNo:this.saveData.orderNo, + objectID:this.saveData.objectID, + partNo:this.saveData.corePartNo, + partDescription:this.saveData.corePartDescription, + createdBy:this.$store.state.user.name, + oldSerialNo:this.saveData.oldSerialNo, + newSerialNo:this.saveData.newSerialNo, + } + this.coreComponentFlag=true; + }, + saveCoreComponent(){ + saveCoreComponent(this.coreComponentData).then(({data}) => { + if (data && data.code === 0) { + this.saveData.corePartNo=this.coreComponentData.partNo + this.saveData.corePartDescription=this.coreComponentData.partDescription + this.saveData.oldSerialNo=this.coreComponentData.oldSerialNo + this.saveData.newSerialNo=this.coreComponentData.newSerialNo + this.getDataList() + this.coreComponentFlag = false + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => {} + }) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }, + componentChange(value){ + if(value&&value!==''){ + this.coreComponentData.partDescription=this.partSpareList.filter(item => item.partNo === value)[0].partDescription; + }else { + this.coreComponentData.partDescription='' + } + } } }