From e14c29166a5e4a2a5eb4419c0930aa19db6aad27 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 15 Apr 2026 09:46:54 +0800
Subject: [PATCH] =?UTF-8?q?2026-04-15=20=E9=A2=86=E6=96=99=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yieldReport/com_produce_report_normal.vue | 70 ++++++++++++++++++-
 1 file changed, 68 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 1507f55..2bab53d 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -899,7 +899,36 @@
     </el-dialog>
 
     <!-- 领料记录弹出框 -->
-    <el-dialog title="领料记录" :close-on-click-modal="false" :visible.sync="showMaterialRecordFlag" width="50%" top="5vh">
+    <el-dialog title="领料记录" :close-on-click-modal="false" :visible.sync="showMaterialRecordFlag" width="65%" top="5vh">
+      <el-form :inline="true" :model="materialRecordSearch" @keyup.enter.native="getMaterialRecordData()" size="small">
+        <el-form-item label="变动单号">
+          <el-input v-model="materialRecordSearch.transactionId" placeholder="变动单号" clearable style="width: 140px;"></el-input>
+        </el-form-item>
+        <el-form-item label="变动类型">
+          <el-select v-model="materialRecordSearch.documentType" placeholder="请选择" clearable style="width: 120px;">
+            <el-option v-for="item in documentTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="标签条码">
+          <el-input v-model="materialRecordSearch.rollNo" placeholder="标签条码" clearable style="width: 140px;"></el-input>
+        </el-form-item>
+        <el-form-item label="标签状态">
+          <el-select v-model="materialRecordSearch.status" placeholder="请选择" clearable style="width: 100px;">
+            <el-option label="出库" value="出库"></el-option>
+            <el-option label="待入" value="待入"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否耗用">
+          <el-select v-model="materialRecordSearch.consumedFlag" placeholder="请选择" clearable style="width: 100px;">
+            <el-option label="已消耗" value="已消耗"></el-option>
+            <el-option label="未使用" value="未使用"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="materialRecordPageIndex=1;getMaterialRecordData()">查询</el-button>
+          <el-button @click="resetMaterialRecordSearch()">重置</el-button>
+        </el-form-item>
+      </el-form>
       <el-table
         :data="materialRecordList"
         border
@@ -1078,6 +1107,25 @@ export default {
       materialRecordPageSize: 20,    // 领料记录分页大小
       materialRecordTotalPage: 0,    // 领料记录总页数
       currentRowForMaterialRecord: null, // 当前领料记录对应的行数据
+      materialRecordSearch: {
+        transactionId: '',
+        documentType: '',
+        rollNo: '',
+        status: '',
+        consumedFlag: ''
+      },
+      documentTypeList: [
+        { label: '采购入库', value: '采购入库' },
+        { label: '采购退货', value: '采购退货' },
+        { label: '生产领料', value: '生产领料' },
+        { label: '生产退仓', value: '生产退仓' },
+        { label: '生产入库', value: '生产入库' },
+        { label: '销售出库', value: '销售出库' },
+        { label: '销售退货', value: '销售退货' },
+        { label: '其他入库', value: '其他入库' },
+        { label: '其他出库', value: '其他出库' },
+        { label: '移库调拨', value: '移库调拨' }
+      ],
       activeTable: 'order_info',
       orderInfo: {
         technicalNotes: '',
@@ -4417,6 +4465,19 @@ export default {
       this.showMaterialRecordFlag = true;
       this.materialRecordPageIndex = 1;
       this.currentRowForMaterialRecord = row;
+      // 重置查询条件
+      this.resetMaterialRecordSearch();
+    },
+    // 重置领料记录查询条件
+    resetMaterialRecordSearch() {
+      this.materialRecordSearch = {
+        transactionId: '',
+        documentType: '',
+        rollNo: '',
+        status: '',
+        consumedFlag: ''
+      };
+      this.materialRecordPageIndex = 1;
       this.getMaterialRecordData();
     },
     // 获取领料记录数据
@@ -4428,7 +4489,12 @@ export default {
         orderNo: this.scheduleData.orderNo,
         partNo: this.currentRowForMaterialRecord.componentPartNo || this.currentRowForMaterialRecord.partNo,
         page: this.materialRecordPageIndex,
-        limit: this.materialRecordPageSize
+        limit: this.materialRecordPageSize,
+        transactionId: this.materialRecordSearch.transactionId,
+        documentType: this.materialRecordSearch.documentType,
+        rollNo: this.materialRecordSearch.rollNo,
+        status: this.materialRecordSearch.status,
+        consumedFlag: this.materialRecordSearch.consumedFlag
       };
       getMaterialRecordList(params).then(({data}) => {
         this.materialRecordLoading = false;