diff --git a/src/api/yieldReport/produce_report_normal.js b/src/api/yieldReport/produce_report_normal.js index b626387..fd26fcd 100644 --- a/src/api/yieldReport/produce_report_normal.js +++ b/src/api/yieldReport/produce_report_normal.js @@ -112,3 +112,6 @@ export const getOrderNotesByOrderNo = data => createAPI('schedule/getOrderNotesB // 打开材料卷(重新激活已完成的材料) export const openMaterialRoll = data => createAPI('schedule/openMaterialRoll', 'POST', data) + +// 获取领料记录 +export const getMaterialRecordList = data => createAPI('schedule/getMaterialRecordList', 'POST', data) diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue index c153859..d42bf65 100644 --- a/src/views/modules/yieldReport/com_produce_report_normal.vue +++ b/src/views/modules/yieldReport/com_produce_report_normal.vue @@ -441,6 +441,16 @@ border v-loading="dataListLoading" style="width: 100%;"> + + + + + + + + + + + + + + + + + 关闭 + + + @@ -907,6 +939,7 @@ import { checkProcessInspectionPendingCount, getOrderNotesByOrderNo, // 新增 openMaterialRoll, // 打开材料卷 + getMaterialRecordList, // 获取领料记录 updateProductionStatus // 暂停生产/继续生产(调用 UspUpdateProductionStatus) } from "@/api/yieldReport/produce_report_normal.js"; import { @@ -1011,6 +1044,9 @@ export default { sopPageIndex: 1, // SOP预览分页当前页 sopPageSize: 20, // SOP预览分页大小 sopTotalPage: 0, // SOP预览总页数 + showMaterialRecordFlag: false, // 领料记录弹出框显示状态 + materialRecordList: [], // 领料记录列表数据 + materialRecordLoading: false, // 领料记录加载状态 activeTable: 'order_info', orderInfo: { technicalNotes: '', @@ -4332,6 +4368,28 @@ export default { // 用户取消操作 }) }, + // 显示领料记录弹出框 + showMaterialRecordDialog(row) { + this.showMaterialRecordFlag = true; + this.materialRecordLoading = true; + this.materialRecordList = []; + let params = { + site: this.scheduleData.site, + orderNo: this.scheduleData.orderNo, + partNo: row.componentPartNo || row.partNo + }; + getMaterialRecordList(params).then(({data}) => { + this.materialRecordLoading = false; + if (data && data.code === 0) { + this.materialRecordList = data.rows || []; + } else { + this.$message.error(data.msg || '获取领料记录失败'); + } + }).catch(() => { + this.materialRecordLoading = false; + this.$message.error('获取领料记录失败'); + }); + }, //刷新派工单 的下机卷的记录 getSfdcRollOpsList() { getSfdcRollOpsByCon(this.searchData).then(({data}) => {