From efe2f546258dd47212642056e9c614f298bbb3f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Wed, 16 Sep 2026 13:22:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=9C=A8=E8=B4=A7=E6=9E=B6?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/labelQueryLocation54.vue              | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/haianWarehouse/warehouse/labelQueryLocation54.vue b/src/views/modules/haianWarehouse/warehouse/labelQueryLocation54.vue
index ddce4c6..cd9578a 100644
--- a/src/views/modules/haianWarehouse/warehouse/labelQueryLocation54.vue
+++ b/src/views/modules/haianWarehouse/warehouse/labelQueryLocation54.vue
@@ -4,12 +4,11 @@
       <el-form-item label="工厂编码">
         <el-input v-model="site" style="width: 100px" disabled></el-input>
       </el-form-item>
-      <el-form-item label="入库状态">
+      <el-form-item label="是否在货架">
         <el-select v-model="queryHeaderData.inStockFlag" placeholder="请选择" style="width: 120px;">
           <el-option label="全部" value=""></el-option>
-          <el-option label="未入库" value="X"></el-option>
-          <el-option label="已出库" value="N"></el-option>
-          <el-option label="在库" value="Y"></el-option>
+          <el-option label="是" value="Y"></el-option>
+          <el-option label="否" value="N"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="本期盘点">
@@ -112,7 +111,8 @@ export default {
       dataListLoading: false,
       height: 500,
       queryHeaderData: {
-        inStockFlag: 'Y',
+        // 查询默认不过滤，是否在货架由海安托盘wcs_location判断 - rqrq
+        inStockFlag: '',
         countFlag: '',
         partNo: '',
         batchNo: '',
@@ -162,7 +162,8 @@ export default {
     },
     resetQuery() {
       this.queryHeaderData = {
-        inStockFlag: 'Y',
+        // 重置后恢复全部，避免沿用旧“入库状态=在库”筛选 - rqrq
+        inStockFlag: '',
         countFlag: '',
         partNo: '',
         batchNo: '',