From b2c916b8063e59c46b8c068b1fc13b6e044d4451 Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Mon, 11 Aug 2025 16:50:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/kpi/controller/KpiController.java  |  2 +-
 ruoyi-ui/src/components/DictData/index.js        |  2 +-
 ruoyi-ui/src/views/in/receive/index.vue          | 16 ++++------------
 ruoyi-ui/src/views/system/dict/data.vue          |  4 ++--
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/kpi/controller/KpiController.java b/ruoyi-admin/src/main/java/com/ruoyi/kpi/controller/KpiController.java
index 27c434e..38810e7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/kpi/controller/KpiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/kpi/controller/KpiController.java
@@ -82,7 +82,7 @@ public class KpiController extends BaseController {
      * @return 货位分析数据
      */
     @GetMapping("/spaceAnalysis")
-    public AjaxResult getSpaceAnalysis(@RequestParam("warehouseId") String warehouseId) {
+    public AjaxResult getSpaceAnalysis(@RequestParam(value = "warehouseId",required = false) String warehouseId) {
         return success(kpiService.getSpaceAnalysis(warehouseId));
     }
 
diff --git a/ruoyi-ui/src/components/DictData/index.js b/ruoyi-ui/src/components/DictData/index.js
index 556d3d6..745e6cc 100644
--- a/ruoyi-ui/src/components/DictData/index.js
+++ b/ruoyi-ui/src/components/DictData/index.js
@@ -37,7 +37,7 @@ function install() {
                   ...item,
                   dictLabel: i18n.t(item.dictLabel) || item.dictLabel
                 }))
-                //console.log(translatedData)
+                console.log(translatedData)
                 store.dispatch('dict/setDict', { key: dictMeta.type, value: translatedData })
                 resolve(translatedData)
               }).catch(error => {
diff --git a/ruoyi-ui/src/views/in/receive/index.vue b/ruoyi-ui/src/views/in/receive/index.vue
index 6a2b260..6f20f57 100644
--- a/ruoyi-ui/src/views/in/receive/index.vue
+++ b/ruoyi-ui/src/views/in/receive/index.vue
@@ -40,10 +40,10 @@
           @change="handleQuery"
         >
           <el-option
-            v-for="dict in statusOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
+            v-for="dict in dict.type.receive_bill_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
@@ -282,8 +282,6 @@ export default {
     return {
       // 仓库选项列表
       warehouseOptions: [],
-      // 单据状态字典
-      statusOptions: [],
       // 遮罩层
       loading: true,
       detailLoading: true,
@@ -520,12 +518,6 @@ export default {
         this.getList()
       })
     },
-    /** 获取字典数据 */
-    getDictList() {
-      getDicts("receive_bill_status").then(response => {
-        this.statusOptions = response.data;
-      });
-    },
     /** 获取仓库列表 */
     getWarehouseList() {
       listWarehouse(this.queryWarehouseParams).then(response => {
diff --git a/ruoyi-ui/src/views/system/dict/data.vue b/ruoyi-ui/src/views/system/dict/data.vue
index b0cf1a7..190cc08 100644
--- a/ruoyi-ui/src/views/system/dict/data.vue
+++ b/ruoyi-ui/src/views/system/dict/data.vue
@@ -107,8 +107,8 @@
       <!-- 字典标签 -->
       <el-table-column :label="$t('systemManagement_DictManagement.dictLabel')" align="center" prop="dictLabel">
         <template slot-scope="scope">
-          <span v-if="(scope.row.listClass == '' || scope.row.listClass == 'default') && (scope.row.cssClass == '' || scope.row.cssClass == null)">{{ scope.row.dictLabel }}</span>
-          <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass" :class="scope.row.cssClass">{{ scope.row.dictLabel }}</el-tag>
+          <span v-if="(scope.row.listClass == '' || scope.row.listClass == 'default') && (scope.row.cssClass == '' || scope.row.cssClass == null)">{{ $t(scope.row.dictLabel) }}</span>
+          <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass" :class="scope.row.cssClass">{{ $t(scope.row.dictLabel) }}</el-tag>
         </template>
       </el-table-column>
       <!-- 字典键值 -->