diff --git a/src/api/mes/reportWorkConsume.js b/src/api/mes/reportWorkConsume.js index b4b5f2b..97d685d 100644 --- a/src/api/mes/reportWorkConsume.js +++ b/src/api/mes/reportWorkConsume.js @@ -77,3 +77,11 @@ export function submitReportInfo(data) { data: data }); } +/**bom组成查看**/ +export function getBomList(query) { + return request({ + url: '/mes/reportWorkConsume/getBomList', + method: 'get', + params: query + }); +} diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index af13f80..386d17f 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -553,6 +553,41 @@ + + + + + + + + + + + + + + + +
@@ -646,7 +681,7 @@ import { listReportWork, getReportWork, delReportWork, addReportWork, getWorkcenterList, updateReportWork,reportSap,getBatchList,reportSapCancel, getReportList,getReportSAPList,submitReportPS,submitReportPSSAP,getCKList} from "@/api/mes/reportWork"; -import { getConsumeList,submitConsumePS,submitReportInfo} from "@/api/mes/reportWorkConsume"; +import { getConsumeList,submitConsumePS,submitReportInfo,getBomList} from "@/api/mes/reportWorkConsume"; import ReportWorkConsume from "./reportWorkConsume.vue"; import ItemSelectUser from "./selectUser.vue"; import ItemSelectWorkOrder from "./selectWorkOrder.vue"; @@ -680,6 +715,8 @@ export default { sOrderTableList: [], pConsumeTableList: [], sConsumeTableList: [], + pBomTableList: [], + sBomTableList: [], activeName0: 'first', activeName: 'pOrder', activeName2: 'pConsume', @@ -943,6 +980,8 @@ export default { this.reportRows = []; this.pConsumeTableList = []; this.sConsumeTableList = []; + this.pBomTableList = [], + this.sBomTableList = [], this.pConsumeRows = []; this.sConsumeRows = []; this.consumeRows = []; @@ -1199,6 +1238,19 @@ export default { this.queryParams.workorderCode = ''; }); + + this.queryParams.workorderCode = sr.workorderCode; + //查询母工单BOM记录列表 + this.queryParams.parentOrder = '0'; + getBomList(this.queryParams).then(response => { + this.pBomTableList = this.handleTree(response, 'materialCode', 'pMaterialCode') + }); + //查询子工单BOM记录列表 + //this.queryParams.parentOrder = sr.workorderCode; + //getBomList(this.queryParams).then(response => { + // this.sBomTableList = response; + // this.queryParams.workorderCode = ''; + //}); }, // 多选框选中数据 pConsumeSelection(selection) { diff --git a/src/views/wms/bom/index.vue b/src/views/wms/bom/index.vue index 86f0ffe..82d210d 100644 --- a/src/views/wms/bom/index.vue +++ b/src/views/wms/bom/index.vue @@ -110,7 +110,7 @@