Merge remote-tracking branch 'origin/master'

ruoyi-admin-vue/src/components/ImportExcel/index.vue

 <template>
   <div>
     <!-- 导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" :before-close="handleBeforeClose"  append-to-body>
       <el-upload
         ref="upload"
         :limit="1"
@@ -54,8 +54,8 @@
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFileForm">确 定</el-button>
-        <el-button @click="upload.open = false">取 消</el-button>
+        <el-button type="primary" @click="submitFileForm" :disabled="upload.isUploading">确 定</el-button>
+        <el-button @click="upload.open = false" :disabled="upload.isUploading">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -159,6 +159,7 @@ export default {
     },
     // 文件上传成功处理
     handleFileSuccess(response, file, fileList) {
+      console.log(response)
       this.upload.open = false
       this.upload.isUploading = false
       this.$refs.upload.clearFiles()
@@ -188,6 +189,7 @@ export default {
     },
     // 提交上传文件
     submitFileForm() {
+      this.upload.isUploading = true
       const file = this.$refs.upload.uploadFiles
       if (
         !file ||
@@ -207,6 +209,14 @@ export default {
       this.$emit("orderTypeChange", this.upload.orderType)
       // 提交上传
       this.$refs.upload.submit()
+    },
+    // 在 methods 中添加
+    handleBeforeClose(done) {
+      if (this.upload.isUploading) {
+        this.$modal.msgWarning("正在上传中，请等待上传完成后再关闭！")
+        return  // 停止关闭
+      }
+      done()  // 执行关闭
     }
   }
 }

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) {