日期查询条件前移

物料分类标识修改

ruoyi-admin-vue/src/views/inventory/inbound/details.vue

@@ -23,6 +23,19 @@
         @search="handleQuery"
         @reset="resetQuery"
       >
+        <el-form-item label="入库日期" prop="inboundDateRange">
+          <el-date-picker
+            v-model="inboundDateRange"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
         <el-form-item label="物料SAPNO" prop="sapNo">
           <el-input
             v-model="queryParams.sapNo"
@@ -101,19 +114,6 @@
             />
           </el-select>
         </el-form-item>
-         <el-form-item label="入库日期" prop="inboundDateRange">
-          <el-date-picker
-            v-model="inboundDateRange"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
       </page-wrapper-search>
 
       <!-- 表格区域 -->

ruoyi-admin-vue/src/views/inventory/inbound/index.vue

@@ -61,6 +61,20 @@
         @search="handleQuery"
         @reset="resetQuery"
       >
+       <!-- ========== 新增：入库日期范围选择器 ========== -->
+        <el-form-item label="入库日期" prop="inboundDateRange">
+          <el-date-picker
+            v-model="inboundDateRange"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
         <el-form-item label="入库单号" prop="orderId">
           <el-input
             v-model="queryParams.orderId"
@@ -134,20 +148,6 @@
             />
           </el-select>
         </el-form-item>
-        <!-- ========== 新增：入库日期范围选择器 ========== -->
-        <el-form-item label="入库日期" prop="inboundDateRange">
-          <el-date-picker
-            v-model="inboundDateRange"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
       </page-wrapper-search>
 
       <!-- 表格区域（对齐字典页面的样式） -->

ruoyi-admin-vue/src/views/inventory/materials/index.vue

@@ -659,7 +659,7 @@ export default {
           .map(item => ({
             ...item,
             // 兜底：如果映射表中没有，显示原始code并标注
-            displayCategory: this.categoryMap[item.categoryCode] || `未匹配分类`
+            displayCategory: this.categoryMap[item.categoryCode] || `-`
           }));
         this.total = total;
       } catch (error) {