From dbcadbb157885d1575ee6132416555f9097a3cb8 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 29 Sep 2026 09:51:21 +0800
Subject: [PATCH] =?UTF-8?q?2026-09-29=20=E5=A2=9E=E5=8A=A0=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/print/rePrintPoPart.vue     |  7 +++++
 .../report/inboundNotificationReport.vue      | 30 +++++++++++++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/print/rePrintPoPart.vue b/src/views/modules/print/rePrintPoPart.vue
index a76d61e..8de233d 100644
--- a/src/views/modules/print/rePrintPoPart.vue
+++ b/src/views/modules/print/rePrintPoPart.vue
@@ -73,6 +73,11 @@
           <el-row :gutter="16">
             <el-col :span="4">
               <el-form-item label="批次号">
+                <el-input v-model="searchData.wdr" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="合约号码">
                 <el-input v-model="searchData.batchNo" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
@@ -545,6 +550,7 @@ export default {
         orderref0:'',
         orderref1:'',
         batchNo:'',
+        wdr:'',
         remark:'',
         page: 1,
         limit: 10,
@@ -1060,6 +1066,7 @@ export default {
         orderref0: '',
         orderref1: '',
         batchNo: '',
+        wdr: '',
         remark: '',
         page: 1,
         limit: 10,
diff --git a/src/views/modules/report/inboundNotificationReport.vue b/src/views/modules/report/inboundNotificationReport.vue
index 9c7261b..42ca8b3 100644
--- a/src/views/modules/report/inboundNotificationReport.vue
+++ b/src/views/modules/report/inboundNotificationReport.vue
@@ -148,6 +148,18 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="4">
+              <el-form-item label="入库仓库">
+                <el-select v-model="searchData.inWarehouse" placeholder="请选择入库仓库" clearable filterable style="width: 100%">
+                  <el-option
+                    v-for="item in warehouseList"
+                    :key="item.warehouseId"
+                    :label="item.warehouseName"
+                    :value="item.warehouseId">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
         </template>
 
@@ -268,6 +280,7 @@
 <script>
 import { searchInboundNotificationReport, getSiteList } from "@/api/report/inboundNotificationReport.js";
 import { getDepartmentList } from "@/api/qc/Inbound_notification.js";
+import { getWarehouseList } from "@/api/wms/wms.js";
 
 export default {
   name: "inboundNotificationReport",
@@ -288,12 +301,15 @@ export default {
         endDate: '',
         queryRelatedOrderNo: '',
         queryRelatedOrderLineNo: '',
-        departmentNo: ''
+        departmentNo: '',
+        inWarehouse: ''
       },
       // Site列表
       siteList: [],
       // 部门列表
       departmentList: [],
+      // 仓库列表
+      warehouseList: [],
       // 搜索展开状态
       searchExpanded: true,
       // 加载状态
@@ -366,6 +382,7 @@ export default {
   created() {
     this.getSiteList();
     this.loadDepartmentList();
+    this.loadWarehouseList();
     this.calculateTableHeight();
     window.addEventListener('resize', this.calculateTableHeight);
   },
@@ -449,7 +466,8 @@ export default {
         endDate: '',
         queryRelatedOrderNo: '',
         queryRelatedOrderLineNo: '',
-        departmentNo: ''
+        departmentNo: '',
+        inWarehouse: ''
       };
       this.pageIndex = 1;
       this.resetSummaryData();
@@ -547,6 +565,14 @@ export default {
         }
       });
     },
+    // 加载仓库列表
+    loadWarehouseList() {
+      getWarehouseList({ userName: this.$store.state.user.name }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.warehouseList = data.rows || [];
+        }
+      });
+    },
     // 根据完成率获取进度条颜色
     getProgressColor(percentage) {
       if (percentage >= 100) {