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: '',