From aa1a2b0b788979022551dd4117812c791c002c9e Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 13 Apr 2026 15:06:46 +0800
Subject: [PATCH] =?UTF-8?q?2026-04-13=20=E8=BF=87=E7=AB=99=E9=87=87?=
=?UTF-8?q?=E9=9B=86-=E3=80=8B=E6=9C=BA=E5=8F=B0=E5=B7=A5=E4=BD=9C?=
=?UTF-8?q?=E5=8F=B0-=E3=80=8B=E6=9D=90=E6=96=99=E6=B8=85=E5=8D=95?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=A1=8C=E6=93=8D=E4=BD=9C?=
=?UTF-8?q?=E3=80=90=E9=A2=86=E6=96=99=E8=AE=B0=E5=BD=95=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/yieldReport/produce_report_normal.js | 3 +
.../yieldReport/com_produce_report_normal.vue | 58 +++++++++++++++++++
2 files changed, 61 insertions(+)
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}) => {