From 5a619821a06ef686884567c40712a4c57efe7d93 Mon Sep 17 00:00:00 2001 From: yuejiayang <146344614+YangLei105@users.noreply.github.com> Date: Mon, 13 Jan 2025 10:04:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?2025.1.13=20=E6=96=87=E6=A1=A3=E6=94=B6?= =?UTF-8?q?=E9=9B=86=20-=20=E7=89=A9=E6=96=99=20-=20=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/eamProject.js | 1 + src/views/modules/eam/eamProjectPartInfo.vue | 240 ++++++++++++++++++- 2 files changed, 237 insertions(+), 4 deletions(-) diff --git a/src/api/eam/eamProject.js b/src/api/eam/eamProject.js index abb4866..08b08ae 100644 --- a/src/api/eam/eamProject.js +++ b/src/api/eam/eamProject.js @@ -37,3 +37,4 @@ export const deleteAndSaveHandle= data => createAPI(`/pms/eamProject/deleteAndSa export const saveHandle= data => createAPI(`/pms/eamProject/saveHandle`,'post',data) export const searchMassProductionBomList= data => createAPI(`/pms/eamProject/searchMassProductionBomList`,'post',data) +export const searchRoutingList= data => createAPI(`/pms/eamProject/searchRoutingList`,'post',data) diff --git a/src/views/modules/eam/eamProjectPartInfo.vue b/src/views/modules/eam/eamProjectPartInfo.vue index 5f6e851..a8dc3ca 100644 --- a/src/views/modules/eam/eamProjectPartInfo.vue +++ b/src/views/modules/eam/eamProjectPartInfo.vue @@ -509,6 +509,40 @@ + + + + + + + + @@ -1154,7 +1188,12 @@ import { confirmatorSendMailHandle, eamProjectPartSearch, eamProjectPartInfoEdit, - getFinalPartDesc, addConfirmatory, deleteConfirmatory, queryEamProjectPart,searchMassProductionBomList + getFinalPartDesc, + addConfirmatory, + deleteConfirmatory, + queryEamProjectPart, + searchMassProductionBomList, + searchRoutingList } from "../../../api/eam/eamProject"; import row from "element-ui/packages/row"; import moment from 'moment'; @@ -1317,6 +1356,7 @@ import {updateColumnSize} from "../../../api/table"; projectAllDocumentConfirmatorList: [], projectANotDocumentConfirmatorList: [], projectPartBomList: [],// 量产BOM原始平面数据数组 + projectPartRoutingList: [],// 原始平面数据数组 confirmatorySelection1: [], confirmatorySelection2: [], proofDocumentListDefinition: [], @@ -2567,6 +2607,170 @@ import {updateColumnSize} from "../../../api/table"; columnWidth: 150, }, ], + columnProjectRoutingList: [ + { + userId: this.$store.state.user.name, + functionId: 401005, + serialNumber: '401005Table1PartNo2', + tableId: "401005Table1", + tableName: "项目物料BOM表", + columnProp: 'partNo2', + headerAlign: "center", + align: "center", + columnLabel: '物料编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 145, + }, + { + userId: this.$store.state.user.name, + functionId: 401005, + serialNumber: '401005Table1WorkCenterNo', + tableId: "401005Table1", + tableName: "项目物料BOM表", + columnProp: 'workCenterNo', + headerAlign: "center", + align: "left", + columnLabel: '加工中心', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 150, + }, + { + userId: this.$store.state.user.name, + functionId: 401005, + serialNumber: '401005Table1ItemNo', + tableId: "401005Table1", + tableName: "项目物料表", + columnProp: 'itemNo', + headerAlign: "center", + align: "center", + columnLabel: '工序行号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 150, + }, + { + userId: this.$store.state.user.name, + functionId: 401005, + serialNumber: '401005Table1RoutingItemNo', + tableId: "401005Table1", + tableName: "项目物料表", + columnProp: 'routingItemNo', + headerAlign: "center", + align: "left", + columnLabel: '标准工序代号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 150, + }, + { + userId: this.$store.state.user.name, + functionId: 401005, + serialNumber: '401005Table1ItemDesc', + tableId: "401005Table1", + tableName: "项目物料表", + columnProp: 'itemDesc', + headerAlign: "center", + align: "left", + columnLabel: '工序名称', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 150, + }, + { + userId: this.$store.state.user.name, + functionId: 401005, + serialNumber: '401005Table1LaborTime', + tableId: "401005Table1", + tableName: "项目物料表", + columnProp: 'laborTime', + headerAlign: "center", + align: "right", + columnLabel: '工时', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 150, + }, + { + userId: this.$store.state.user.name, + functionId: 401005, + serialNumber: '401005Table1LaborResources', + tableId: "401005Table1", + tableName: "项目物料表", + columnProp: 'laborResources', + headerAlign: "center", + align: "right", + columnLabel: '人数', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 150, + }, + { + userId: this.$store.state.user.name, + functionId: 401005, + serialNumber: '401005Table1MachRunFactor', + tableId: "401005Table1", + tableName: "项目物料表", + columnProp: 'machRunFactor', + headerAlign: "center", + align: "right", + columnLabel: '单位工时', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 150, + }, + { + userId: this.$store.state.user.name, + functionId: 401005, + serialNumber: '401005Table1FactorUnit', + tableId: "401005Table1", + tableName: "项目物料表", + columnProp: 'factorUnit', + headerAlign: "center", + align: "center", + columnLabel: '单位', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 150, + }, + ], levelList: [], rules:{ projectNo:[ @@ -5193,6 +5397,28 @@ import {updateColumnSize} from "../../../api/table"; }) }, + fetchRoutingList() { + let inData = { + site: this.proofingCurrentRow.site, + buNo: this.proofingCurrentRow.buNo, + projectId: this.proofingCurrentRow.projectId, + projectNo: this.proofingCurrentRow.projectNo, + projectDesc: this.proofingCurrentRow.projectDesc, + projectPartId: this.proofingCurrentRow.projectPartId, + testPartNo: this.proofingCurrentRow.testPartNo, + partNo:this.proofingCurrentRow.finalPartNo, + partDesc: this.proofingCurrentRow.partDesc, + page: 1, + limit: 1000 + } + searchRoutingList(inData).then(({data}) => { + if (data && data.code === 0){ + this.dataListLoading = false; + this.projectPartRoutingList = data.list + } + }) + }, + // 列表表格选择替换 tabClick (tab, event) { // 刷新列表数据 @@ -5209,14 +5435,14 @@ import {updateColumnSize} from "../../../api/table"; this.searchProjectAllDocumentList() this.searchConfirmatorList() } - if (this.activeName == 'productionDocumentsConfirmProgress'){ + if (this.activeName === 'productionDocumentsConfirmProgress'){ this.getConfirmProgressDocumentList() this.getConfirmProgressPusherList() } - if (this.activeName == 'massProductionBOM' && this.proofingCurrentRow.finalPartNo !== '' && this.proofingCurrentRow.finalPartNo !== null){ + if (this.activeName === 'massProductionBOM' && this.proofingCurrentRow.finalPartNo !== '' && this.proofingCurrentRow.finalPartNo !== null){ this.dataListLoading = true; try { - // 模拟从后端获取数据 + // 从后端获取数据 const flatData = await this.fetchBomList(); // 将平铺数据转换为树形结构 this.projectPartBomList = arrayToTreeByLevelCode(flatData, "levelCode", "children"); @@ -5228,6 +5454,12 @@ import {updateColumnSize} from "../../../api/table"; } else { this.projectPartBomList = [] } + if (this.activeName === 'Routing' && this.proofingCurrentRow.finalPartNo !== '' && this.proofingCurrentRow.finalPartNo !== null){ + this.dataListLoading = true; + this.fetchRoutingList() + } else { + this.projectPartRoutingList = [] + } }, //获取按钮的权限数据 getButtonAuthData () { From 915eaffd0429e0b6dd3df47a1037abd3e76d03e7 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Mon, 13 Jan 2025 10:49:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=87=E5=93=81=E5=A4=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/eam/eamWorkOrderForApprove.vue | 308 +++++++++++++----- .../modules/eam/eamWorkOrderForDefect.vue | 135 +++++++- .../reportWorkOrder/reportDefectOrder.vue | 6 + 3 files changed, 355 insertions(+), 94 deletions(-) diff --git a/src/views/modules/eam/eamWorkOrderForApprove.vue b/src/views/modules/eam/eamWorkOrderForApprove.vue index e25d63d..8a5e147 100644 --- a/src/views/modules/eam/eamWorkOrderForApprove.vue +++ b/src/views/modules/eam/eamWorkOrderForApprove.vue @@ -46,6 +46,9 @@ + + + @@ -280,7 +283,7 @@ - + 取消审核 @@ -292,6 +295,9 @@ 备件图片 + + 核心配件 + @@ -318,6 +324,27 @@ 关闭 + + + + + + + + + + + + + + + + + + + 关闭 + + @@ -452,11 +479,24 @@ endDate:'', departmentName: '', documentSource: '', + corePartNo: '', page: 1, limit: 10, urgency: '', result: '' }, + coreComponentData:{ + site:'', + orderNo:'', + buNo:'', + objectID:'', + partNo:'', + partDescription:'', + createdBy:'', + oldSerialNo:'', + newSerialNo:'', + }, + coreComponentFlag:false, height: 200, pageIndex: 1, pageSize: 50, @@ -471,9 +511,9 @@ columnList: [ { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1BuDesc', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1BuDesc', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'buDesc', headerAlign: "center", @@ -489,9 +529,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1DisposalMeasures', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1DisposalMeasures', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'disposalMeasures', headerAlign: "center", @@ -507,9 +547,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1OrderNo', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1OrderNo', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'orderNo', headerAlign: "center", @@ -525,9 +565,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1PlanID', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1PlanID', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'planID', headerAlign: "center", @@ -543,9 +583,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1FeedBackDesc', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1FeedBackDesc', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'feedBackDesc', headerAlign: "center", @@ -561,9 +601,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1DefectID', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1DefectID', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'defectID', headerAlign: "center", @@ -579,9 +619,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1DefectDesc', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1DefectDesc', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'defectDesc', headerAlign: "center", @@ -597,9 +637,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1ObjectID', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1ObjectID', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'objectID', headerAlign: "center", @@ -615,9 +655,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1ObjectDesc', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1ObjectDesc', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'objectDesc', headerAlign: "center", @@ -633,9 +673,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1ResourceDesc', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1ResourceDesc', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'resourceDesc', headerAlign: "center", @@ -651,9 +691,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1DepartmentName', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1DepartmentName', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'departmentName', headerAlign: "center", @@ -669,9 +709,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1CreateBy', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1CreateBy', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'createBy', headerAlign: "center", @@ -687,9 +727,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1Status', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1Status', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'status', headerAlign: "center", @@ -705,9 +745,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1PlanOperatorName', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1PlanOperatorName', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'planOperatorName', headerAlign: "center", @@ -723,9 +763,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1ActualOperatorName', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1ActualOperatorName', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'actualOperatorName', headerAlign: "center", @@ -741,9 +781,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1PlanDate', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1PlanDate', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'planDate', headerAlign: "center", @@ -759,9 +799,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1CreatedDate', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1CreatedDate', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'createdDate', headerAlign: "center", @@ -777,9 +817,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1ReachDate', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1ReachDate', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'reachDate', headerAlign: "center", @@ -795,9 +835,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1ActualDate', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1ActualDate', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'actualDate', headerAlign: "center", @@ -813,9 +853,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1ResponseTime', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1ResponseTime', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'responseTime', headerAlign: "center", @@ -831,9 +871,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1WorkTime', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1WorkTime', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'workTime', headerAlign: "center", @@ -849,9 +889,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1Remark', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1Remark', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'remark', headerAlign: "center", @@ -867,9 +907,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1DifficultyLevel', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1DifficultyLevel', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'difficultyLevel', headerAlign: "center", @@ -885,9 +925,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1DifficultyRemark', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1DifficultyRemark', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'difficultyRemark', headerAlign: "center", @@ -903,9 +943,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1DocumentSource', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1DocumentSource', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'documentSource', headerAlign: "center", @@ -921,9 +961,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1FaultReason', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1FaultReason', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'faultReason', headerAlign: "center", @@ -939,9 +979,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1HandlingMethod', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1HandlingMethod', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'handlingMethod', headerAlign: "center", @@ -957,9 +997,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1PreventiveMeasure', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1PreventiveMeasure', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'preventiveMeasure', headerAlign: "center", @@ -975,9 +1015,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101004002, - serialNumber: '101004002Table1Remark', - tableId: "101004002Table1", + functionId: 101004004, + serialNumber: '101004004Table1Remark', + tableId: "101004004Table1", tableName: "维修工单表", columnProp: 'remark', headerAlign: "center", @@ -991,6 +1031,78 @@ fixed: '', columnWidth: 200, }, + { + userId: this.$store.state.user.name, + functionId: 101004004, + serialNumber: '101004004Table1CorePartNo', + tableId: "101004004Table1", + 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: 101004004, + serialNumber: '101004004Table1CorePartDescription', + tableId: "101004004Table1", + 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: 101004004, + serialNumber: '101004004Table1OldSerialNo', + tableId: "101004004Table1", + 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: 101004004, + serialNumber: '101004004Table1NewSerialNo', + tableId: "101004004Table1", + tableName: "维修执行表", + columnProp: 'newSerialNo', + headerAlign: "center", + align: "left", + columnLabel: '新序列号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120, + }, ], changeModelFlag: false, planOperator: '', @@ -1489,7 +1601,11 @@ resourceDesc: row.resourceDesc, feedBackDesc: row.feedBackDesc, faultReason: row.faultReason, - preventiveMeasure: row.preventiveMeasure + preventiveMeasure: row.preventiveMeasure, + corePartNo:row.corePartNo, + corePartDescription:row.corePartDescription, + oldSerialNo:row.oldSerialNo, + newSerialNo:row.newSerialNo, } this.detailModelFlag = true }, @@ -1705,6 +1821,20 @@ this.authCancel = !cancelFlag this.authCheck = !checkFlag }, + coreComponentModal(){ + this.coreComponentData={ + site:this.detailData.site, + buNo:this.detailData.buNo, + orderNo:this.detailData.orderNo, + objectID:this.detailData.objectID, + partNo:this.detailData.corePartNo, + partDescription:this.detailData.corePartDescription, + createdBy:this.$store.state.user.name, + oldSerialNo:this.detailData.oldSerialNo, + newSerialNo:this.detailData.newSerialNo, + } + this.coreComponentFlag=true; + }, } } diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue index a2f46d7..93f8a8e 100644 --- a/src/views/modules/eam/eamWorkOrderForDefect.vue +++ b/src/views/modules/eam/eamWorkOrderForDefect.vue @@ -46,6 +46,9 @@ + + + @@ -266,7 +269,7 @@ - + 取消审核 @@ -279,7 +282,7 @@ 备件图片 - 核心配件 + 核心配件 @@ -307,7 +310,27 @@ 关闭 - + + + + + + + + + + + + + + + + + + + 关闭 + +
@@ -425,10 +448,23 @@ exportList: [], // 导出 end tagNo: '', + coreComponentData:{ + site:'', + orderNo:'', + buNo:'', + objectID:'', + partNo:'', + partDescription:'', + createdBy:'', + oldSerialNo:'', + newSerialNo:'', + }, + coreComponentFlag:false, searchData: { site: '', userName: this.$store.state.user.name, orderNo: '', + corePartNo: '', planID: '', objectID: '', planOperator: '', @@ -978,6 +1014,78 @@ fixed: '', columnWidth: 200, }, + { + userId: this.$store.state.user.name, + functionId: 101004002, + serialNumber: '101004002Table1CorePartNo', + tableId: "101004002Table1", + 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: 101004002, + serialNumber: '101004002Table1CorePartDescription', + tableId: "101004002Table1", + 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: 101004002, + serialNumber: '101004002Table1OldSerialNo', + tableId: "101004002Table1", + 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: 101004002, + serialNumber: '101004002Table1NewSerialNo', + tableId: "101004002Table1", + tableName: "维修执行表", + columnProp: 'newSerialNo', + headerAlign: "center", + align: "left", + columnLabel: '新序列号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120, + }, ], changeModelFlag: false, planOperator: '', @@ -1404,7 +1512,11 @@ resourceDesc: row.resourceDesc, feedBackDesc: row.feedBackDesc, faultReason: row.faultReason, - preventiveMeasure: row.preventiveMeasure + preventiveMeasure: row.preventiveMeasure, + corePartNo:row.corePartNo, + corePartDescription:row.corePartDescription, + oldSerialNo:row.oldSerialNo, + newSerialNo:row.newSerialNo, } this.detailModelFlag = true }, @@ -1618,7 +1730,20 @@ this.authDetail = !detailFlag this.authCancel = !cancelFlag }, - + coreComponentModal(){ + this.coreComponentData={ + site:this.detailData.site, + buNo:this.detailData.buNo, + orderNo:this.detailData.orderNo, + objectID:this.detailData.objectID, + partNo:this.detailData.corePartNo, + partDescription:this.detailData.corePartDescription, + createdBy:this.$store.state.user.name, + oldSerialNo:this.detailData.oldSerialNo, + newSerialNo:this.detailData.newSerialNo, + } + this.coreComponentFlag=true; + }, } } diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue index c87938e..92a037c 100644 --- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue +++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue @@ -44,6 +44,11 @@ + + + + + @@ -635,6 +640,7 @@ exportList: [], // 导出 end searchData: { + corePartNo: '', site: '', userName: this.$store.state.user.name, orderNo: '',