From b91c4fbd313111ec7fb57b6af3272080e8e98d18 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Wed, 6 May 2026 10:28:14 +0800
Subject: [PATCH] =?UTF-8?q?refactor(wcs):=20=E6=9B=BF=E6=8D=A2=E7=A1=AC?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E4=B8=BA?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=A0=87=E7=AD=BE=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 统一使用dict-tag组件显示字典数据，移除硬编码的状态映射和标签样式
- 重构多个页面中的状态显示逻辑，提升代码可维护性
---
 src/views/wcs/agvStatus/index.vue       |  65 ++++--
 src/views/wcs/baseDictionary/index.vue  |  75 +++++--
 src/views/wcs/configinfo/index.vue      |  25 ++-
 src/views/wcs/equipinfo/index.vue       |  71 ++----
 src/views/wcs/inoutrecord/index.vue     |  30 +--
 src/views/wcs/location/index.vue        |  62 ++----
 src/views/wcs/materialinfo/index.vue    |  44 +++-
 src/views/wcs/report/index.vue          |  27 +--
 src/views/wcs/rfidinfo/index.vue        |  30 +--
 src/views/wcs/subtaskInstance/index.vue |  43 +++-
 src/views/wcs/subtaskTemplate/index.vue | 134 +++++++++--
 src/views/wcs/taskInstance/index.vue    |  29 ++-
 src/views/wcs/tasktype/index.vue        |  85 ++++---
 src/views/wcs/warehouse/Reference.vue   | 284 ++++++++++++++++++++++++
 src/views/wcs/warehouse/index.vue       |  32 ++-
 15 files changed, 745 insertions(+), 291 deletions(-)
 create mode 100644 src/views/wcs/warehouse/Reference.vue

diff --git a/src/views/wcs/agvStatus/index.vue b/src/views/wcs/agvStatus/index.vue
index ba3b838..2ff3027 100644
--- a/src/views/wcs/agvStatus/index.vue
+++ b/src/views/wcs/agvStatus/index.vue
@@ -17,7 +17,9 @@
               <el-input v-model="queryParams.mapcode" placeholder="请输入地图编号" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="是否在线" prop="online">
-              <el-input v-model="queryParams.online" placeholder="请输入是否在线" clearable @keyup.enter="handleQuery" />
+              <el-select v-model="queryParams.online" placeholder="请选择是否在线" clearable>
+                <el-option v-for="dict in online_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
             </el-form-item>
             <el-form-item label="路线" prop="path">
               <el-input v-model="queryParams.path" placeholder="请输入路线" clearable @keyup.enter="handleQuery" />
@@ -34,20 +36,22 @@
             <el-form-item label="Y" prop="posy">
               <el-input v-model="queryParams.posy" placeholder="请输入Y" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="机器人方向 (范围 -180~360度)" prop="robotdir">
-              <el-input v-model="queryParams.robotdir" placeholder="请输入机器人方向 (范围 -180~360度)" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="机器人方向" prop="robotdir">
+              <el-input v-model="queryParams.robotdir" placeholder="请输入机器人方向" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="机器人Ip" prop="robotip">
-              <el-input v-model="queryParams.robotip" placeholder="请输入机器人Ip" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="机器人IP" prop="robotip">
+              <el-input v-model="queryParams.robotip" placeholder="请输入机器人IP" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="机器人速度" prop="speed">
               <el-input v-model="queryParams.speed" placeholder="请输入机器人速度" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="详细状态信息，关联agv状态码查询" prop="statusDetail">
-              <el-input v-model="queryParams.statusDetail" placeholder="请输入详细状态信息，关联agv状态码查询" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="状态详情" prop="statusDetail">
+              <el-input v-model="queryParams.statusDetail" placeholder="请输入状态详情" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="是否暂停 0-否 1-是" prop="stop">
-              <el-input v-model="queryParams.stop" placeholder="请输入是否暂停 0-否 1-是" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="是否暂停" prop="stop">
+              <el-select v-model="queryParams.stop" placeholder="请选择是否暂停" clearable>
+                <el-option v-for="dict in yes_no_int" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
             </el-form-item>
             <el-form-item label="时间" prop="timestamp">
               <el-date-picker clearable
@@ -92,9 +96,17 @@
         <el-table-column v-if="columns[2].visible" label="设备编号" align="center" prop="equipNo" min-width="110" />
         <el-table-column v-if="columns[3].visible" label="小车名称" align="center" prop="agvname" min-width="110" />
         <el-table-column v-if="columns[4].visible" label="电量" align="center" prop="battery" width="80" />
-        <el-table-column v-if="columns[5].visible" label="排除状态" align="center" prop="excltype" width="100" />
+        <el-table-column v-if="columns[5].visible" label="排除状态" align="center" prop="excltype" width="100">
+          <template #default="scope">
+            <dict-tag :options="excl_type" :value="scope.row.excltype" />
+          </template>
+        </el-table-column>
         <el-table-column v-if="columns[6].visible" label="地图编号" align="center" prop="mapcode" width="100" />
-        <el-table-column v-if="columns[7].visible" label="在线状态" align="center" prop="online" width="100" />
+        <el-table-column v-if="columns[7].visible" label="在线状态" align="center" prop="online" width="100">
+          <template #default="scope">
+            <dict-tag :options="online_status" :value="scope.row.online" />
+          </template>
+        </el-table-column>
         <el-table-column v-if="columns[8].visible" label="路线" align="center" prop="path" min-width="160" :show-overflow-tooltip="true" />
         <el-table-column v-if="columns[9].visible" label="背货架编号" align="center" prop="podcode" min-width="120" />
         <el-table-column v-if="columns[10].visible" label="背货架方向" align="center" prop="poddir" width="110" />
@@ -105,7 +117,11 @@
         <el-table-column v-if="columns[15].visible" label="速度" align="center" prop="speed" width="80" />
         <el-table-column v-if="columns[16].visible" label="机器人状态" align="center" prop="status" width="110" />
         <el-table-column v-if="columns[17].visible" label="状态详情" align="center" prop="statusDetail" min-width="150" :show-overflow-tooltip="true" />
-        <el-table-column v-if="columns[18].visible" label="暂停状态" align="center" prop="stop" width="100" />
+        <el-table-column v-if="columns[18].visible" label="暂停状态" align="center" prop="stop" width="100">
+          <template #default="scope">
+            <dict-tag :options="yes_no_int" :value="scope.row.stop" />
+          </template>
+        </el-table-column>
         <el-table-column v-if="columns[19].visible" label="状态时间" align="center" prop="timestamp" width="170">
           <template #default="scope">
             <span>{{ parseTime(scope.row.timestamp, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -126,7 +142,7 @@
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改AGV状态对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="660px" append-to-body>
       <el-form ref="agvStatusFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="设备编号" prop="equipNo">
           <el-input v-model="form.equipNo" placeholder="请输入设备编号" />
@@ -141,7 +157,9 @@
           <el-input v-model="form.mapcode" placeholder="请输入地图编号" />
         </el-form-item>
         <el-form-item label="是否在线" prop="online">
-          <el-input v-model="form.online" placeholder="请输入是否在线" />
+          <el-select v-model="form.online" placeholder="请选择是否在线">
+            <el-option v-for="dict in online_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
         </el-form-item>
         <el-form-item label="路线" prop="path">
             <el-input v-model="form.path" type="textarea" placeholder="请输入内容" />
@@ -158,20 +176,22 @@
         <el-form-item label="Y" prop="posy">
           <el-input v-model="form.posy" placeholder="请输入Y" />
         </el-form-item>
-        <el-form-item label="机器人方向 (范围 -180~360度)" prop="robotdir">
-          <el-input v-model="form.robotdir" placeholder="请输入机器人方向 (范围 -180~360度)" />
+        <el-form-item label="机器人方向" prop="robotdir">
+          <el-input v-model="form.robotdir" placeholder="请输入机器人方向" />
         </el-form-item>
-        <el-form-item label="机器人Ip" prop="robotip">
-          <el-input v-model="form.robotip" placeholder="请输入机器人Ip" />
+        <el-form-item label="机器人IP" prop="robotip">
+          <el-input v-model="form.robotip" placeholder="请输入机器人IP" />
         </el-form-item>
         <el-form-item label="机器人速度" prop="speed">
           <el-input v-model="form.speed" placeholder="请输入机器人速度" />
         </el-form-item>
-        <el-form-item label="详细状态信息，关联agv状态码查询" prop="statusDetail">
-          <el-input v-model="form.statusDetail" placeholder="请输入详细状态信息，关联agv状态码查询" />
+        <el-form-item label="状态详情" prop="statusDetail">
+          <el-input v-model="form.statusDetail" placeholder="请输入状态详情" />
         </el-form-item>
-        <el-form-item label="是否暂停 0-否 1-是" prop="stop">
-          <el-input v-model="form.stop" placeholder="请输入是否暂停 0-否 1-是" />
+        <el-form-item label="是否暂停" prop="stop">
+          <el-radio-group v-model="form.stop">
+            <el-radio v-for="dict in yes_no_int" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="时间" prop="timestamp">
           <el-date-picker clearable
@@ -197,6 +217,7 @@ import { listAgvStatus, getAgvStatus, delAgvStatus, addAgvStatus, updateAgvStatu
 import { AgvStatusVO, AgvStatusQuery, AgvStatusForm } from '@/api/wcs/agvStatus/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { excl_type, online_status, yes_no_int } = toRefs<any>(proxy?.useDict('excl_type', 'online_status', 'yes_no_int'));
 
 const agvStatusList = ref<AgvStatusVO[]>([]);
 const buttonLoading = ref(false);
diff --git a/src/views/wcs/baseDictionary/index.vue b/src/views/wcs/baseDictionary/index.vue
index d252066..db6058c 100644
--- a/src/views/wcs/baseDictionary/index.vue
+++ b/src/views/wcs/baseDictionary/index.vue
@@ -4,24 +4,26 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="字典名;字典名" prop="dicName">
-              <el-input v-model="queryParams.dicName" placeholder="请输入字典名;字典名" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="字典名" prop="dicName">
+              <el-input v-model="queryParams.dicName" placeholder="请输入字典名" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="对应名;对应名" prop="dicKey">
-              <el-input v-model="queryParams.dicKey" placeholder="请输入对应名;对应名" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="字典Key" prop="dicKey">
+              <el-input v-model="queryParams.dicKey" placeholder="请输入字典Key" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="模板;模板" prop="dicValue">
-              <el-input v-model="queryParams.dicValue" placeholder="请输入模板;模板" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="字典值" prop="dicValue">
+              <el-input v-model="queryParams.dicValue" placeholder="请输入字典值" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="是否可用  0:不可用  1:可用;是否可用  0:不可用  1:可用" prop="useFlag">
-              <el-input v-model="queryParams.useFlag" placeholder="请输入是否可用  0:不可用  1:可用;是否可用  0:不可用  1:可用" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="可用标识" prop="useFlag">
+              <el-select v-model="queryParams.useFlag" placeholder="请选择可用标识" clearable>
+                <el-option v-for="dict in use_flag" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+              </el-select>
             </el-form-item>
-            <el-form-item label="创建时间;创建时间" prop="createdTime">
+            <el-form-item label="创建时间" prop="createdTime">
               <el-date-picker clearable
                 v-model="queryParams.createdTime"
                 type="date"
                 value-format="YYYY-MM-DD"
-                placeholder="请选择创建时间;创建时间"
+                placeholder="请选择创建时间"
               />
             </el-form-item>
             <el-form-item>
@@ -58,9 +60,21 @@
         <el-table-column v-if="columns[1].visible" label="字典名" align="center" prop="dicName" min-width="130" :show-overflow-tooltip="true" />
         <el-table-column v-if="columns[2].visible" label="字典Key" align="center" prop="dicKey" min-width="130" :show-overflow-tooltip="true" />
         <el-table-column v-if="columns[3].visible" label="字典值" align="center" prop="dicValue" width="110" />
-        <el-table-column v-if="columns[4].visible" label="可用标识" align="center" prop="useFlag" width="100" />
-        <el-table-column v-if="columns[5].visible" label="AGV取放类型" align="center" prop="agvType" min-width="120" :show-overflow-tooltip="true" />
-        <el-table-column v-if="columns[6].visible" label="AGV任务类型" align="center" prop="agvTaskType" min-width="120" :show-overflow-tooltip="true" />
+        <el-table-column v-if="columns[4].visible" label="可用标识" align="center" prop="useFlag" width="100">
+          <template #default="scope">
+            <dict-tag :options="use_flag" :value="scope.row.useFlag" />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="columns[5].visible" label="AGV取放类型" align="center" prop="agvType" min-width="120" :show-overflow-tooltip="true">
+          <template #default="scope">
+            <dict-tag :options="agv_type" :value="scope.row.agvType" />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="columns[6].visible" label="AGV任务类型" align="center" prop="agvTaskType" min-width="120" :show-overflow-tooltip="true">
+          <template #default="scope">
+            <dict-tag :options="agv_task_type" :value="scope.row.agvTaskType" />
+          </template>
+        </el-table-column>
         <el-table-column v-if="columns[7].visible" label="创建人" align="center" prop="createdBy" width="110" />
         <el-table-column v-if="columns[8].visible" label="创建时间" align="center" prop="createdTime" width="170">
           <template #default="scope">
@@ -85,24 +99,36 @@
     <!-- 添加或修改字典对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="baseDictionaryFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="字典名;字典名" prop="dicName">
-          <el-input v-model="form.dicName" placeholder="请输入字典名;字典名" />
+        <el-form-item label="字典名" prop="dicName">
+          <el-input v-model="form.dicName" placeholder="请输入字典名" />
         </el-form-item>
-        <el-form-item label="对应名;对应名" prop="dicKey">
-          <el-input v-model="form.dicKey" placeholder="请输入对应名;对应名" />
+        <el-form-item label="字典Key" prop="dicKey">
+          <el-input v-model="form.dicKey" placeholder="请输入字典Key" />
         </el-form-item>
-        <el-form-item label="模板;模板" prop="dicValue">
-          <el-input v-model="form.dicValue" placeholder="请输入模板;模板" />
+        <el-form-item label="字典值" prop="dicValue">
+          <el-input v-model="form.dicValue" placeholder="请输入字典值" />
         </el-form-item>
-        <el-form-item label="是否可用  0:不可用  1:可用;是否可用  0:不可用  1:可用" prop="useFlag">
-          <el-input v-model="form.useFlag" placeholder="请输入是否可用  0:不可用  1:可用;是否可用  0:不可用  1:可用" />
+        <el-form-item label="可用标识" prop="useFlag">
+          <el-radio-group v-model="form.useFlag">
+            <el-radio v-for="dict in use_flag" :key="dict.value" :value="parseInt(dict.value)">{{ dict.label }}</el-radio>
+          </el-radio-group>
         </el-form-item>
-        <el-form-item label="创建时间;创建时间" prop="createdTime">
+        <el-form-item label="AGV取放类型" prop="agvType">
+          <el-select v-model="form.agvType" placeholder="请选择AGV取放类型" clearable>
+            <el-option v-for="dict in agv_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="AGV任务类型" prop="agvTaskType">
+          <el-select v-model="form.agvTaskType" placeholder="请选择AGV任务类型" clearable>
+            <el-option v-for="dict in agv_task_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createdTime">
           <el-date-picker clearable
             v-model="form.createdTime"
             type="datetime"
             value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择创建时间;创建时间">
+            placeholder="请选择创建时间">
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -121,6 +147,7 @@ import { listBaseDictionary, getBaseDictionary, delBaseDictionary, addBaseDictio
 import { BaseDictionaryVO, BaseDictionaryQuery, BaseDictionaryForm } from '@/api/wcs/baseDictionary/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { use_flag, agv_type, agv_task_type } = toRefs<any>(proxy?.useDict('use_flag', 'agv_type', 'agv_task_type'));
 
 const baseDictionaryList = ref<BaseDictionaryVO[]>([]);
 const buttonLoading = ref(false);
@@ -180,7 +207,7 @@ const data = reactive<PageData<BaseDictionaryForm, BaseDictionaryQuery>>({
   },
   rules: {
     id: [
-      { required: true, message: "主键;主键不能为空", trigger: "blur" }
+      { required: true, message: "记录不能为空", trigger: "blur" }
     ],
   }
 });
diff --git a/src/views/wcs/configinfo/index.vue b/src/views/wcs/configinfo/index.vue
index 5f3a1ce..ccef8eb 100644
--- a/src/views/wcs/configinfo/index.vue
+++ b/src/views/wcs/configinfo/index.vue
@@ -15,12 +15,12 @@
             </el-form-item>
             <el-form-item label="数据类型" prop="type">
               <el-select v-model="queryParams.type" placeholder="请选择数据类型" clearable filterable>
-                <el-option v-for="item in dataTypeOptions" :key="item" :label="item" :value="item" />
+                <el-option v-for="dict in plc_data_type" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="启用状态" prop="isFalg">
               <el-select v-model="queryParams.isFalg" placeholder="请选择启用状态" clearable>
-                <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="Number(dict.value)" />
+                <el-option v-for="dict in is_falg" :key="dict.value" :label="dict.label" :value="Number(dict.value)" />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -69,10 +69,14 @@
         <el-table-column v-if="columns[1].visible" label="PLC分组" align="center" prop="plcConfigId" width="90" />
         <el-table-column v-if="columns[2].visible" label="配置Key" align="center" prop="configKey" min-width="180" :show-overflow-tooltip="true" />
         <el-table-column v-if="columns[3].visible" label="配置值" align="center" prop="configValue" min-width="170" :show-overflow-tooltip="true" />
-        <el-table-column v-if="columns[4].visible" label="数据类型" align="center" prop="type" width="110" />
+        <el-table-column v-if="columns[4].visible" label="数据类型" align="center" prop="type" width="110">
+          <template #default="scope">
+            <dict-tag :options="plc_data_type" :value="scope.row.type" />
+          </template>
+        </el-table-column>
         <el-table-column v-if="columns[5].visible" label="启用状态" align="center" prop="isFalg" width="100">
           <template #default="scope">
-            <dict-tag :options="sys_normal_disable" :value="scope.row.isFalg" />
+            <dict-tag :options="is_falg" :value="scope.row.isFalg" />
           </template>
         </el-table-column>
         <el-table-column v-if="columns[6].visible" label="备注" align="center" prop="remark" min-width="180" :show-overflow-tooltip="true" />
@@ -107,7 +111,7 @@
           <el-col :span="12">
             <el-form-item label="启用状态" prop="isFalg">
               <el-radio-group v-model="form.isFalg">
-                <el-radio-button v-for="dict in sys_normal_disable" :key="dict.value" :value="Number(dict.value)">
+                <el-radio-button v-for="dict in is_falg" :key="dict.value" :value="Number(dict.value)">
                   {{ dict.label }}
                 </el-radio-button>
               </el-radio-group>
@@ -126,7 +130,7 @@
           <el-col :span="12">
             <el-form-item label="数据类型" prop="type">
               <el-select v-model="form.type" placeholder="请选择或输入数据类型" filterable allow-create clearable class="w-full">
-                <el-option v-for="item in dataTypeOptions" :key="item" :label="item" :value="item" />
+                <el-option v-for="dict in plc_data_type" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -159,14 +163,14 @@
         <el-table-column label="数据类型" width="150">
           <template #default="scope">
             <el-select v-model="scope.row.type" filterable allow-create clearable>
-              <el-option v-for="item in dataTypeOptions" :key="item" :label="item" :value="item" />
+              <el-option v-for="dict in plc_data_type" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </template>
         </el-table-column>
         <el-table-column label="启用状态" width="140" align="center">
           <template #default="scope">
             <el-select v-model="scope.row.isFalg">
-              <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="Number(dict.value)" />
+              <el-option v-for="dict in is_falg" :key="dict.value" :label="dict.label" :value="Number(dict.value)" />
             </el-select>
           </template>
         </el-table-column>
@@ -220,7 +224,8 @@ import { ConfiginfoBatchForm, ConfiginfoForm, ConfiginfoQuery, ConfiginfoVO } fr
 import { globalHeaders } from '@/utils/request';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
+// 与 BaseConfiginfoVo @ExcelDictFormat 对齐；PLC数据类型仍允许现场补充 string(N) 等长度化类型。
+const { is_falg, plc_data_type } = toRefs<any>(proxy?.useDict('is_falg', 'plc_data_type'));
 
 const configinfoList = ref<ConfiginfoVO[]>([]);
 const selectedRows = ref<ConfiginfoVO[]>([]);
@@ -256,8 +261,6 @@ const upload = reactive<ImportOption>({
   url: import.meta.env.VITE_APP_BASE_API + '/wcs/configinfo/importData'
 });
 
-const dataTypeOptions = ['bool', 'int', 'short', 'long', 'double', 'float', 'string(10)', 'string(20)', 'string(50)'];
-
 const columns = ref<FieldOption[]>([
   { key: 0, label: '序号', visible: true, children: [] },
   { key: 1, label: 'PLC分组', visible: true, children: [] },
diff --git a/src/views/wcs/equipinfo/index.vue b/src/views/wcs/equipinfo/index.vue
index 624e322..653f514 100644
--- a/src/views/wcs/equipinfo/index.vue
+++ b/src/views/wcs/equipinfo/index.vue
@@ -22,17 +22,17 @@
             </el-form-item>
             <el-form-item label="设备类型" prop="equipType">
               <el-select v-model="queryParams.equipType" placeholder="请选择设备类型" clearable>
-                <el-option v-for="item in equipTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
+                <el-option v-for="dict in equip_type" :key="dict.value" :label="dict.label" :value="Number(dict.value)" />
               </el-select>
             </el-form-item>
             <el-form-item label="设备状态" prop="equipStatus">
               <el-select v-model="queryParams.equipStatus" placeholder="请选择设备状态" clearable>
-                <el-option v-for="item in equipStatusOptions" :key="item.value" :label="item.label" :value="item.value" />
+                <el-option v-for="dict in equip_status" :key="dict.value" :label="dict.label" :value="Number(dict.value)" />
               </el-select>
             </el-form-item>
             <el-form-item label="可用标识" prop="useFlag">
               <el-select v-model="queryParams.useFlag" placeholder="请选择可用标识" clearable>
-                <el-option v-for="item in useFlagOptions" :key="item.value" :label="item.label" :value="item.value" />
+                <el-option v-for="dict in use_flag" :key="dict.value" :label="dict.label" :value="Number(dict.value)" />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -77,7 +77,11 @@
                 <el-table-column label="参数键" prop="paramKey" min-width="130" />
                 <el-table-column label="参数名称" prop="paramName" min-width="130" />
                 <el-table-column label="参数值" prop="paramValue" min-width="150" />
-                <el-table-column label="参数类型" prop="paramType" width="110" />
+                <el-table-column label="参数类型" prop="paramType" width="110">
+                  <template #default="scope">
+                    <dict-tag :options="param_type" :value="scope.row.paramType" />
+                  </template>
+                </el-table-column>
                 <el-table-column label="单位" prop="paramUnit" width="100" />
               </el-table>
             </div>
@@ -88,7 +92,7 @@
         <el-table-column v-if="columns[2].visible" label="设备名称" align="center" prop="equipName" min-width="160" :show-overflow-tooltip="true" />
         <el-table-column v-if="columns[3].visible" label="设备类型" align="center" prop="equipType" width="120">
           <template #default="scope">
-            <el-tag>{{ getOptionLabel(equipTypeOptions, scope.row.equipType) }}</el-tag>
+            <dict-tag :options="equip_type" :value="scope.row.equipType" />
           </template>
         </el-table-column>
         <el-table-column v-if="columns[4].visible" label="仓库" align="center" min-width="150" :show-overflow-tooltip="true">
@@ -98,16 +102,12 @@
         </el-table-column>
         <el-table-column v-if="columns[5].visible" label="设备状态" align="center" prop="equipStatus" width="100">
           <template #default="scope">
-            <el-tag :type="getOptionTag(equipStatusOptions, scope.row.equipStatus)">
-              {{ getOptionLabel(equipStatusOptions, scope.row.equipStatus) }}
-            </el-tag>
+            <dict-tag :options="equip_status" :value="scope.row.equipStatus" />
           </template>
         </el-table-column>
         <el-table-column v-if="columns[6].visible" label="可用标识" align="center" prop="useFlag" width="100">
           <template #default="scope">
-            <el-tag :type="getOptionTag(useFlagOptions, scope.row.useFlag)">
-              {{ getOptionLabel(useFlagOptions, scope.row.useFlag) }}
-            </el-tag>
+            <dict-tag :options="use_flag" :value="scope.row.useFlag" />
           </template>
         </el-table-column>
         <el-table-column v-if="columns[7].visible" label="服务地址" align="center" min-width="150" :show-overflow-tooltip="true">
@@ -167,7 +167,7 @@
           <el-col :span="8">
             <el-form-item label="设备类型" prop="equipType">
               <el-select v-model="form.equipType" placeholder="请选择设备类型" class="w-full">
-                <el-option v-for="item in equipTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
+                <el-option v-for="dict in equip_type" :key="dict.value" :label="dict.label" :value="Number(dict.value)" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -196,14 +196,14 @@
           <el-col :span="8">
             <el-form-item label="设备状态" prop="equipStatus">
               <el-select v-model="form.equipStatus" placeholder="请选择设备状态" class="w-full">
-                <el-option v-for="item in equipStatusOptions" :key="item.value" :label="item.label" :value="item.value" />
+                <el-option v-for="dict in equip_status" :key="dict.value" :label="dict.label" :value="Number(dict.value)" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="可用标识" prop="useFlag">
               <el-radio-group v-model="form.useFlag">
-                <el-radio-button v-for="item in useFlagOptions" :key="item.value" :value="item.value">{{ item.label }}</el-radio-button>
+                <el-radio-button v-for="dict in use_flag" :key="dict.value" :value="Number(dict.value)">{{ dict.label }}</el-radio-button>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -258,7 +258,7 @@
           <el-table-column label="参数类型" width="140">
             <template #default="scope">
               <el-select v-model="scope.row.paramType" filterable allow-create>
-                <el-option v-for="item in paramTypeOptions" :key="item" :label="item" :value="item" />
+                <el-option v-for="dict in param_type" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </template>
           </el-table-column>
@@ -293,13 +293,9 @@ import { EquipParameterVO, EquipinfoForm, EquipinfoQuery, EquipinfoVO } from '@/
 import { listWarehouse } from '@/api/wcs/warehouse';
 import { WarehouseVO } from '@/api/wcs/warehouse/types';
 
-interface NumberOption {
-  label: string;
-  value: number;
-  tag?: '' | 'success' | 'warning' | 'info' | 'primary' | 'danger';
-}
-
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+// 与 BaseEquipinfoVo / BaseEquipParameterVo @ExcelDictFormat 对齐，设备主数据和参数类型均走系统字典。
+const { equip_status, use_flag, equip_type, param_type } = toRefs<any>(proxy?.useDict('equip_status', 'use_flag', 'equip_type', 'param_type'));
 
 const equipinfoList = ref<EquipinfoVO[]>([]);
 const warehouseOptions = ref<WarehouseVO[]>([]);
@@ -319,24 +315,6 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
-// 这些选项来自当前表字段注释，只负责显示和录入，不承载流程状态流转规则。
-const equipStatusOptions: NumberOption[] = [
-  { label: '空闲', value: 0, tag: 'success' },
-  { label: '忙碌', value: 1, tag: 'warning' },
-  { label: '异常', value: 2, tag: 'danger' }
-];
-const useFlagOptions: NumberOption[] = [
-  { label: '不可用', value: 0, tag: 'danger' },
-  { label: '可用', value: 1, tag: 'success' }
-];
-const equipTypeOptions: NumberOption[] = [
-  { label: 'AGV', value: 1, tag: 'primary' },
-  { label: '接驳/补充点', value: 2, tag: 'success' },
-  { label: '机台上料点', value: 3, tag: 'warning' },
-  { label: '色粉库位', value: 7, tag: 'info' }
-];
-const paramTypeOptions = ['STRING', 'INT', 'DOUBLE', 'BOOLEAN', 'JSON'];
-
 const columns = ref<FieldOption[]>([
   { key: 0, label: '序号', visible: true, children: [] },
   { key: 1, label: '设备编号', visible: true, children: [] },
@@ -468,13 +446,18 @@ const handleDeleteParameter = (index: number) => {
   form.value.parameterList?.splice(index, 1);
 };
 
+const lookupEquipTypeLabel = (value?: number) => {
+  const dict = (equip_type.value || []).find((item: any) => Number(item.value) === Number(value));
+  return dict?.label || String(value ?? '');
+};
+
 const syncParameterMasterFields = () => {
   // 子表以设备编号做业务关联，提交前统一同步主表值，避免现场改编号后参数仍指向旧设备。
   form.value.parameterList = (form.value.parameterList || []).map((item: EquipParameterVO) => ({
     ...item,
     equipCode: form.value.equipNo,
     equipName: form.value.equipName,
-    equipType: getOptionLabel(equipTypeOptions, form.value.equipType)
+    equipType: lookupEquipTypeLabel(form.value.equipType)
   }));
 };
 
@@ -523,14 +506,6 @@ const handleExport = () => {
   proxy?.download('wcs/equipinfo/export', { ...queryParams.value }, `equipinfo_${new Date().getTime()}.xlsx`);
 };
 
-const getOptionLabel = (options: NumberOption[], value?: number) => {
-  return options.find((item) => item.value === Number(value))?.label || String(value ?? '未知');
-};
-
-const getOptionTag = (options: NumberOption[], value?: number) => {
-  return options.find((item) => item.value === Number(value))?.tag || 'info';
-};
-
 const getWarehouseName = (warehouseId?: number) => {
   return warehouseOptions.value.find((item) => Number(item.warehouseId) === Number(warehouseId))?.warehouseName || warehouseId || '';
 };
diff --git a/src/views/wcs/inoutrecord/index.vue b/src/views/wcs/inoutrecord/index.vue
index 59fa409..7aa1c39 100644
--- a/src/views/wcs/inoutrecord/index.vue
+++ b/src/views/wcs/inoutrecord/index.vue
@@ -6,7 +6,7 @@
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="出入库方向" prop="inoutFlag">
               <el-select v-model="queryParams.inoutFlag" placeholder="请选择方向" clearable>
-                <el-option v-for="item in inoutFlagOptions" :key="item.value" :label="item.label" :value="item.value" />
+                <el-option v-for="dict in inout_flag" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
               </el-select>
             </el-form-item>
             <el-form-item label="物料类型" prop="materialType">
@@ -59,9 +59,7 @@
         <el-table-column v-if="columns[0].visible" type="index" label="序号" width="60" align="center" />
         <el-table-column v-if="columns[1].visible" label="出入库方向" align="center" prop="inoutFlag" width="120">
           <template #default="scope">
-            <el-tag :type="getOptionTag(inoutFlagOptions, scope.row.inoutFlag)">
-              {{ getOptionLabel(inoutFlagOptions, scope.row.inoutFlag) }}
-            </el-tag>
+            <dict-tag :options="inout_flag" :value="scope.row.inoutFlag" />
           </template>
         </el-table-column>
         <el-table-column v-if="columns[2].visible" label="物料类型" align="center" prop="materialType" min-width="120" />
@@ -104,9 +102,7 @@
     <el-dialog title="出入库记录详情" v-model="detailOpen" width="620px" append-to-body>
       <el-descriptions v-if="currentRecord" :column="2" border>
         <el-descriptions-item label="出入库方向">
-          <el-tag :type="getOptionTag(inoutFlagOptions, currentRecord.inoutFlag)">
-            {{ getOptionLabel(inoutFlagOptions, currentRecord.inoutFlag) }}
-          </el-tag>
+          <dict-tag :options="inout_flag" :value="currentRecord.inoutFlag" />
         </el-descriptions-item>
         <el-descriptions-item label="仓库">{{ getWarehouseName(currentRecord.warehouseId) }}</el-descriptions-item>
         <el-descriptions-item label="物料类型">{{ currentRecord.materialType }}</el-descriptions-item>
@@ -125,13 +121,8 @@ import { InoutrecordQuery, InoutrecordVO } from '@/api/wcs/inoutrecord/types';
 import { listWarehouse } from '@/api/wcs/warehouse';
 import { WarehouseVO } from '@/api/wcs/warehouse/types';
 
-interface NumberOption {
-  label: string;
-  value: number;
-  tag?: '' | 'success' | 'warning' | 'info' | 'primary' | 'danger';
-}
-
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { inout_flag } = toRefs<any>(proxy?.useDict('inout_flag'));
 
 const inoutrecordList = ref<InoutrecordVO[]>([]);
 const warehouseOptions = ref<WarehouseVO[]>([]);
@@ -144,11 +135,6 @@ const currentRecord = ref<InoutrecordVO>();
 
 const queryFormRef = ref<ElFormInstance>();
 
-const inoutFlagOptions: NumberOption[] = [
-  { label: '入库', value: 1, tag: 'success' },
-  { label: '出库', value: 2, tag: 'warning' }
-];
-
 const columns = ref<FieldOption[]>([
   { key: 0, label: '序号', visible: true, children: [] },
   { key: 1, label: '出入库方向', visible: true, children: [] },
@@ -216,14 +202,6 @@ const handleExport = () => {
   proxy?.download('wcs/inoutrecord/export', { ...buildQueryParams() }, `inoutrecord_${new Date().getTime()}.xlsx`);
 };
 
-const getOptionLabel = (options: NumberOption[], value?: number) => {
-  return options.find((item) => item.value === Number(value))?.label || (value ?? '未知');
-};
-
-const getOptionTag = (options: NumberOption[], value?: number) => {
-  return options.find((item) => item.value === Number(value))?.tag || 'info';
-};
-
 const getWarehouseName = (warehouseId?: string) => {
   const warehouse = warehouseOptions.value.find((item) => String(item.warehouseId) === String(warehouseId));
   return warehouse ? `${warehouse.warehouseName}（${warehouse.warehouseId}）` : warehouseId || '';
diff --git a/src/views/wcs/location/index.vue b/src/views/wcs/location/index.vue
index 28a7b9f..56b5c2b 100644
--- a/src/views/wcs/location/index.vue
+++ b/src/views/wcs/location/index.vue
@@ -25,12 +25,12 @@
             </el-form-item>
             <el-form-item label="激活标记" prop="activeFlag">
               <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标记" clearable>
-                <el-option v-for="item in activeFlagOptions" :key="item.value" :label="item.label" :value="item.value" />
+                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
               </el-select>
             </el-form-item>
             <el-form-item label="库位状态" prop="locationStatus">
               <el-select v-model="queryParams.locationStatus" placeholder="请选择库位状态" clearable>
-                <el-option v-for="item in locationStatusOptions" :key="item.value" :label="item.label" :value="item.value" />
+                <el-option v-for="dict in location_status" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -92,20 +92,23 @@
         <el-table-column v-if="columns[7].visible" label="数量" align="center" prop="locCount" width="80" />
         <el-table-column v-if="columns[8].visible" label="激活标记" align="center" prop="activeFlag" width="100">
           <template #default="scope">
-            <el-tag :type="getOptionTag(activeFlagOptions, scope.row.activeFlag)">
-              {{ getOptionLabel(activeFlagOptions, scope.row.activeFlag) }}
-            </el-tag>
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag" />
           </template>
         </el-table-column>
-        <el-table-column v-if="columns[9].visible" label="RFID设备Key" align="center" prop="equipKey" min-width="120" />
-        <el-table-column v-if="columns[10].visible" label="创建人" align="center" prop="createBy" width="100" />
-        <el-table-column v-if="columns[11].visible" label="创建时间" align="center" prop="createdTime" width="170">
+        <el-table-column v-if="columns[9].visible" label="库位状态" align="center" prop="locationStatus" width="100">
+          <template #default="scope">
+            <dict-tag :options="location_status" :value="scope.row.locationStatus" />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="columns[10].visible" label="RFID设备Key" align="center" prop="equipKey" min-width="120" />
+        <el-table-column v-if="columns[11].visible" label="创建人" align="center" prop="createBy" width="100" />
+        <el-table-column v-if="columns[12].visible" label="创建时间" align="center" prop="createdTime" width="170">
           <template #default="scope">
             <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column v-if="columns[12].visible" label="更新人" align="center" prop="updatedBy" width="100" />
-        <el-table-column v-if="columns[13].visible" label="更新时间" align="center" prop="updatedTime" width="170">
+        <el-table-column v-if="columns[13].visible" label="更新人" align="center" prop="updatedBy" width="100" />
+        <el-table-column v-if="columns[14].visible" label="更新时间" align="center" prop="updatedTime" width="170">
           <template #default="scope">
             <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
@@ -181,14 +184,14 @@
           <el-col :span="8">
             <el-form-item label="激活标记" prop="activeFlag">
               <el-radio-group v-model="form.activeFlag">
-                <el-radio-button v-for="item in activeFlagOptions" :key="item.value" :value="item.value">{{ item.label }}</el-radio-button>
+                <el-radio-button v-for="dict in active_flag" :key="dict.value" :value="parseInt(dict.value)">{{ dict.label }}</el-radio-button>
               </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="库位状态" prop="locationStatus">
               <el-radio-group v-model="form.locationStatus">
-                <el-radio-button v-for="item in locationStatusOptions" :key="item.value" :value="item.value">{{ item.label }}</el-radio-button>
+                <el-radio-button v-for="dict in location_status" :key="dict.value" :value="parseInt(dict.value)">{{ dict.label }}</el-radio-button>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -221,13 +224,8 @@ import { LocationForm, LocationQuery, LocationVO } from '@/api/wcs/location/type
 import { listWarehouse } from '@/api/wcs/warehouse';
 import { WarehouseVO } from '@/api/wcs/warehouse/types';
 
-interface NumberOption {
-  label: string;
-  value: number;
-  tag?: '' | 'success' | 'warning' | 'info' | 'primary' | 'danger';
-}
-
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag, location_status } = toRefs<any>(proxy?.useDict('active_flag', 'location_status'));
 
 const locationList = ref<LocationVO[]>([]);
 const warehouseOptions = ref<WarehouseVO[]>([]);
@@ -247,15 +245,6 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
-const activeFlagOptions: NumberOption[] = [
-  { label: '停用', value: 0, tag: 'info' },
-  { label: '激活', value: 1, tag: 'success' }
-];
-const locationStatusOptions: NumberOption[] = [
-  { label: '正常', value: 0, tag: 'success' },
-  { label: '锁定', value: 1, tag: 'warning' }
-];
-
 const columns = ref<FieldOption[]>([
   { key: 0, label: '序号', visible: true, children: [] },
   { key: 1, label: '仓库', visible: true, children: [] },
@@ -266,11 +255,12 @@ const columns = ref<FieldOption[]>([
   { key: 6, label: '料箱编码', visible: true, children: [] },
   { key: 7, label: '数量', visible: true, children: [] },
   { key: 8, label: '激活标记', visible: true, children: [] },
-  { key: 9, label: 'RFID设备Key', visible: true, children: [] },
-  { key: 10, label: '创建人', visible: true, children: [] },
-  { key: 11, label: '创建时间', visible: true, children: [] },
-  { key: 12, label: '更新人', visible: true, children: [] },
-  { key: 13, label: '更新时间', visible: true, children: [] }
+  { key: 9, label: '库位状态', visible: true, children: [] },
+  { key: 10, label: 'RFID设备Key', visible: true, children: [] },
+  { key: 11, label: '创建人', visible: true, children: [] },
+  { key: 12, label: '创建时间', visible: true, children: [] },
+  { key: 13, label: '更新人', visible: true, children: [] },
+  { key: 14, label: '更新时间', visible: true, children: [] }
 ]);
 
 const initFormData: LocationForm = {
@@ -437,14 +427,6 @@ const getLocationState = (row: LocationVO) => {
   return row.containerCode ? { label: '占用', tag: 'danger' as const } : { label: '空闲', tag: 'success' as const };
 };
 
-const getOptionLabel = (options: NumberOption[], value?: number) => {
-  return options.find((item) => item.value === Number(value))?.label || (value ?? '未知');
-};
-
-const getOptionTag = (options: NumberOption[], value?: number) => {
-  return options.find((item) => item.value === Number(value))?.tag || 'info';
-};
-
 const getWarehouseName = (warehouseId?: number) => {
   return warehouseOptions.value.find((item) => Number(item.warehouseId) === Number(warehouseId))?.warehouseName || warehouseId || '';
 };
diff --git a/src/views/wcs/materialinfo/index.vue b/src/views/wcs/materialinfo/index.vue
index 89d47d4..7f527a3 100644
--- a/src/views/wcs/materialinfo/index.vue
+++ b/src/views/wcs/materialinfo/index.vue
@@ -11,13 +11,19 @@
               <el-input v-model="queryParams.materialName" placeholder="请输入物料名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="物料类型" prop="materialType">
-              <el-input v-model="queryParams.materialType" placeholder="请输入物料类型" clearable @keyup.enter="handleQuery" />
+              <el-select v-model="queryParams.materialType" placeholder="请选择物料类型" clearable filterable>
+                <el-option v-for="dict in material_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
             </el-form-item>
             <el-form-item label="物料分类" prop="materialCategory">
-              <el-input v-model="queryParams.materialCategory" placeholder="请输入物料分类" clearable @keyup.enter="handleQuery" />
+              <el-select v-model="queryParams.materialCategory" placeholder="请选择物料分类" clearable filterable>
+                <el-option v-for="dict in material_category" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
             </el-form-item>
             <el-form-item label="状态" prop="status">
-              <el-input-number v-model="queryParams.status" :min="0" :controls="false" placeholder="请输入状态" />
+              <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
+                <el-option v-for="dict in enable_status" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+              </el-select>
             </el-form-item>
             <el-form-item label="创建时间" prop="createtime">
               <el-date-picker clearable
@@ -60,9 +66,21 @@
         <el-table-column v-if="columns[0].visible" type="index" label="序号" width="60" align="center" />
         <el-table-column v-if="columns[1].visible" label="物料编码" align="center" prop="materialCode" min-width="130" :show-overflow-tooltip="true" />
         <el-table-column v-if="columns[2].visible" label="物料名称" align="center" prop="materialName" min-width="150" :show-overflow-tooltip="true" />
-        <el-table-column v-if="columns[3].visible" label="物料类型" align="center" prop="materialType" min-width="110" :show-overflow-tooltip="true" />
-        <el-table-column v-if="columns[4].visible" label="物料分类" align="center" prop="materialCategory" min-width="120" :show-overflow-tooltip="true" />
-        <el-table-column v-if="columns[5].visible" label="状态" align="center" prop="status" width="90" />
+        <el-table-column v-if="columns[3].visible" label="物料类型" align="center" prop="materialType" min-width="110" :show-overflow-tooltip="true">
+          <template #default="scope">
+            <dict-tag :options="material_type" :value="scope.row.materialType" />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="columns[4].visible" label="物料分类" align="center" prop="materialCategory" min-width="120" :show-overflow-tooltip="true">
+          <template #default="scope">
+            <dict-tag :options="material_category" :value="scope.row.materialCategory" />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="columns[5].visible" label="状态" align="center" prop="status" width="90">
+          <template #default="scope">
+            <dict-tag :options="enable_status" :value="scope.row.status" />
+          </template>
+        </el-table-column>
         <el-table-column v-if="columns[6].visible" label="备注" align="center" prop="remark" min-width="180" :show-overflow-tooltip="true" />
         <el-table-column v-if="columns[7].visible" label="创建时间" align="center" prop="createtime" width="170">
           <template #default="scope">
@@ -95,13 +113,19 @@
           <el-input v-model="form.materialName" placeholder="请输入物料名称" />
         </el-form-item>
         <el-form-item label="物料类型" prop="materialType">
-          <el-input v-model="form.materialType" placeholder="请输入物料类型" />
+          <el-select v-model="form.materialType" placeholder="请选择物料类型" filterable allow-create clearable>
+            <el-option v-for="dict in material_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
         </el-form-item>
         <el-form-item label="物料分类" prop="materialCategory">
-          <el-input v-model="form.materialCategory" placeholder="请输入物料分类" />
+          <el-select v-model="form.materialCategory" placeholder="请选择物料分类" filterable allow-create clearable>
+            <el-option v-for="dict in material_category" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
         </el-form-item>
         <el-form-item label="状态" prop="status">
-          <el-input-number v-model="form.status" :min="0" :controls="false" class="w-full" placeholder="请输入状态" />
+          <el-radio-group v-model="form.status">
+            <el-radio v-for="dict in enable_status" :key="dict.value" :value="parseInt(dict.value)">{{ dict.label }}</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
             <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
@@ -122,6 +146,8 @@ import { listMaterialinfo, getMaterialinfo, delMaterialinfo, addMaterialinfo, up
 import { MaterialinfoVO, MaterialinfoQuery, MaterialinfoForm } from '@/api/wcs/materialinfo/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+// 与 BaseMaterialinfoVo @ExcelDictFormat 对齐；物料类型/分类允许现场按业务继续补充。
+const { material_type, material_category, enable_status } = toRefs<any>(proxy?.useDict('material_type', 'material_category', 'enable_status'));
 
 const materialinfoList = ref<MaterialinfoVO[]>([]);
 const buttonLoading = ref(false);
diff --git a/src/views/wcs/report/index.vue b/src/views/wcs/report/index.vue
index f023f1a..52dff8e 100644
--- a/src/views/wcs/report/index.vue
+++ b/src/views/wcs/report/index.vue
@@ -106,7 +106,7 @@
         <el-table-column label="任务类型" prop="taskTypeName" min-width="130" :show-overflow-tooltip="true" />
         <el-table-column label="状态" prop="status" width="110" align="center">
           <template #default="scope">
-            <el-tag :type="getTaskStatusTag(scope.row.status)">{{ getTaskStatusLabel(scope.row.status) }}</el-tag>
+            <dict-tag :options="task_status" :value="scope.row.status" />
           </template>
         </el-table-column>
         <el-table-column label="结果码" prop="resultCode" width="90" align="center" />
@@ -129,6 +129,7 @@ import { listWarehouse } from '@/api/wcs/warehouse';
 import { WarehouseVO } from '@/api/wcs/warehouse/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { task_status } = toRefs<any>(proxy?.useDict('task_status'));
 
 const loading = ref(false);
 const dateRange = ref<[string, string]>(['', '']);
@@ -335,30 +336,6 @@ const getUtilizationTag = (value?: number) => {
   return 'success';
 };
 
-const getTaskStatusLabel = (status?: string) => {
-  const statusMap: Record<string, string> = {
-    PENDING: '待执行',
-    RUNNING: '执行中',
-    PAUSED: '已暂停',
-    SUCCESS: '成功',
-    FAILED: '失败',
-    CANCELLED: '已取消'
-  };
-  return status ? statusMap[status] || status : '';
-};
-
-const getTaskStatusTag = (status?: string) => {
-  const tagMap: Record<string, 'success' | 'warning' | 'info' | 'primary' | 'danger'> = {
-    PENDING: 'info',
-    RUNNING: 'primary',
-    PAUSED: 'warning',
-    SUCCESS: 'success',
-    FAILED: 'danger',
-    CANCELLED: 'info'
-  };
-  return status ? tagMap[status] || 'info' : 'info';
-};
-
 onMounted(async () => {
   await getWarehouseOptions();
   await getReportData();
diff --git a/src/views/wcs/rfidinfo/index.vue b/src/views/wcs/rfidinfo/index.vue
index 98fa49b..2bf455a 100644
--- a/src/views/wcs/rfidinfo/index.vue
+++ b/src/views/wcs/rfidinfo/index.vue
@@ -15,12 +15,12 @@
             </el-form-item>
             <el-form-item label="启用状态" prop="isFalg">
               <el-select v-model="queryParams.isFalg" placeholder="请选择启用状态" clearable>
-                <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="Number(dict.value)" />
+                <el-option v-for="dict in is_falg" :key="dict.value" :label="dict.label" :value="Number(dict.value)" />
               </el-select>
             </el-form-item>
             <el-form-item label="在线状态" prop="isOnline">
               <el-select v-model="queryParams.isOnline" placeholder="请选择在线状态" clearable>
-                <el-option v-for="item in onlineOptions" :key="item.value" :label="item.label" :value="item.value" />
+                <el-option v-for="dict in online_status" :key="dict.value" :label="dict.label" :value="Number(dict.value)" />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -68,12 +68,12 @@
         </el-table-column>
         <el-table-column v-if="columns[5].visible" label="启用状态" align="center" prop="isFalg" width="100">
           <template #default="scope">
-            <dict-tag :options="sys_normal_disable" :value="scope.row.isFalg" />
+            <dict-tag :options="is_falg" :value="scope.row.isFalg" />
           </template>
         </el-table-column>
         <el-table-column v-if="columns[6].visible" label="在线状态" align="center" prop="isOnline" width="100">
           <template #default="scope">
-            <el-tag :type="getOnlineTag(scope.row.isOnline)">{{ getOnlineLabel(scope.row.isOnline) }}</el-tag>
+            <dict-tag :options="online_status" :value="scope.row.isOnline" />
           </template>
         </el-table-column>
         <el-table-column v-if="columns[7].visible" label="备注" align="center" prop="remark" min-width="160" :show-overflow-tooltip="true" />
@@ -128,7 +128,7 @@
           <el-col :span="12">
             <el-form-item label="启用状态" prop="isFalg">
               <el-radio-group v-model="form.isFalg">
-                <el-radio-button v-for="dict in sys_normal_disable" :key="dict.value" :value="Number(dict.value)">
+                <el-radio-button v-for="dict in is_falg" :key="dict.value" :value="Number(dict.value)">
                   {{ dict.label }}
                 </el-radio-button>
               </el-radio-group>
@@ -137,7 +137,9 @@
           <el-col :span="12">
             <el-form-item label="在线状态" prop="isOnline">
               <el-radio-group v-model="form.isOnline">
-                <el-radio-button v-for="item in onlineOptions" :key="item.value" :value="item.value">{{ item.label }}</el-radio-button>
+                <el-radio-button v-for="dict in online_status" :key="dict.value" :value="Number(dict.value)">
+                  {{ dict.label }}
+                </el-radio-button>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -164,7 +166,8 @@ import { addRfidinfo, delRfidinfo, getRfidinfo, listRfidinfo, updateRfidinfo } f
 import { RfidinfoForm, RfidinfoQuery, RfidinfoVO } from '@/api/wcs/rfidinfo/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
+// 与 BaseRfidinfoVo @ExcelDictFormat 对齐：is_falg / online_status。
+const { is_falg, online_status } = toRefs<any>(proxy?.useDict('is_falg', 'online_status'));
 
 const rfidinfoList = ref<RfidinfoVO[]>([]);
 const buttonLoading = ref(false);
@@ -183,11 +186,6 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
-const onlineOptions: Array<{ label: string; value: number; tag: 'success' | 'danger' | 'info' }> = [
-  { label: '离线', value: 0, tag: 'danger' },
-  { label: '在线', value: 1, tag: 'success' }
-];
-
 const columns = ref<FieldOption[]>([
   { key: 0, label: '序号', visible: true, children: [] },
   { key: 1, label: '设备名称', visible: true, children: [] },
@@ -342,14 +340,6 @@ const formatEndpoint = (ip?: string, port?: number) => {
   return port ? `${ip || '-'}:${port}` : ip;
 };
 
-const getOnlineLabel = (value?: number) => {
-  return onlineOptions.find((item) => item.value === Number(value))?.label || '未知';
-};
-
-const getOnlineTag = (value?: number) => {
-  return onlineOptions.find((item) => item.value === Number(value))?.tag || 'info';
-};
-
 onMounted(() => {
   getList();
 });
diff --git a/src/views/wcs/subtaskInstance/index.vue b/src/views/wcs/subtaskInstance/index.vue
index c5cfb0f..5933635 100644
--- a/src/views/wcs/subtaskInstance/index.vue
+++ b/src/views/wcs/subtaskInstance/index.vue
@@ -25,11 +25,18 @@
             <el-form-item label="终点编号" prop="endAgvpoint">
               <el-input v-model="queryParams.endAgvpoint" placeholder="请输入终点编号" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="是否可用  0:不可用  1:可用" prop="useFlag">
-              <el-input-number v-model="queryParams.useFlag" :min="0" :controls="false" placeholder="请输入可用标识" />
+            <el-form-item label="任务状态" prop="taskStatus">
+              <el-select v-model="queryParams.taskStatus" placeholder="请选择任务状态" clearable>
+                <el-option v-for="dict in subtask_status" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+              </el-select>
             </el-form-item>
-            <el-form-item label="Agv返回code" prop="taskcode">
-              <el-input v-model="queryParams.taskcode" placeholder="请输入Agv返回code" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="可用标识" prop="useFlag">
+              <el-select v-model="queryParams.useFlag" placeholder="请选择可用标识" clearable>
+                <el-option v-for="dict in use_flag" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="AGV返回码" prop="taskcode">
+              <el-input v-model="queryParams.taskcode" placeholder="请输入AGV返回码" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="创建时间" prop="createdTime">
               <el-date-picker clearable
@@ -80,12 +87,20 @@
         <el-table-column v-if="columns[2].visible" label="设备编号" align="center" prop="equipmentNo" min-width="120" />
         <el-table-column v-if="columns[3].visible" label="托盘RFID" align="center" prop="palletInfoCode" min-width="140" :show-overflow-tooltip="true" />
         <el-table-column v-if="columns[4].visible" label="任务类型" align="center" prop="taskType" width="100" />
-        <el-table-column v-if="columns[5].visible" label="任务状态" align="center" prop="taskStatus" width="100" />
+        <el-table-column v-if="columns[5].visible" label="任务状态" align="center" prop="taskStatus" width="100">
+          <template #default="scope">
+            <dict-tag :options="subtask_status" :value="scope.row.taskStatus" />
+          </template>
+        </el-table-column>
         <el-table-column v-if="columns[6].visible" label="起始点编号" align="center" prop="startAgvpoint" min-width="120" />
         <el-table-column v-if="columns[7].visible" label="当前点编号" align="center" prop="currAgvpoint" min-width="120" />
         <el-table-column v-if="columns[8].visible" label="下一点编号" align="center" prop="nextAgvpoint" min-width="120" />
         <el-table-column v-if="columns[9].visible" label="终点编号" align="center" prop="endAgvpoint" min-width="120" />
-        <el-table-column v-if="columns[10].visible" label="可用标识" align="center" prop="useFlag" width="100" />
+        <el-table-column v-if="columns[10].visible" label="可用标识" align="center" prop="useFlag" width="100">
+          <template #default="scope">
+            <dict-tag :options="use_flag" :value="scope.row.useFlag" />
+          </template>
+        </el-table-column>
         <el-table-column v-if="columns[11].visible" label="AGV返回码" align="center" prop="taskcode" min-width="120" />
         <el-table-column v-if="columns[12].visible" label="创建人" align="center" prop="createdBy" width="110" />
         <el-table-column v-if="columns[13].visible" label="创建时间" align="center" prop="createdTime" width="170">
@@ -134,11 +149,18 @@
         <el-form-item label="终点编号" prop="endAgvpoint">
           <el-input v-model="form.endAgvpoint" placeholder="请输入终点编号" />
         </el-form-item>
-        <el-form-item label="可用标识" prop="useFlag">
-          <el-input-number v-model="form.useFlag" :min="0" :controls="false" class="w-full" placeholder="请输入可用标识" />
+        <el-form-item label="任务状态" prop="taskStatus">
+          <el-select v-model="form.taskStatus" placeholder="请选择任务状态">
+            <el-option v-for="dict in subtask_status" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+          </el-select>
         </el-form-item>
-        <el-form-item label="Agv返回code" prop="taskcode">
-          <el-input v-model="form.taskcode" placeholder="请输入Agv返回code" />
+        <el-form-item label="可用标识" prop="useFlag">
+          <el-radio-group v-model="form.useFlag">
+            <el-radio v-for="dict in use_flag" :key="dict.value" :value="parseInt(dict.value)">{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="AGV返回码" prop="taskcode">
+          <el-input v-model="form.taskcode" placeholder="请输入AGV返回码" />
         </el-form-item>
         <el-form-item label="任务名称" prop="taskName">
           <el-input v-model="form.taskName" placeholder="请输入任务名称" />
@@ -162,6 +184,7 @@ import { listSubtaskInstance, getSubtaskInstance, delSubtaskInstance, addSubtask
 import { SubtaskInstanceVO, SubtaskInstanceQuery, SubtaskInstanceForm } from '@/api/wcs/subtaskInstance/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { subtask_status, use_flag } = toRefs<any>(proxy?.useDict('subtask_status', 'use_flag'));
 
 const subtaskInstanceList = ref<SubtaskInstanceVO[]>([]);
 const buttonLoading = ref(false);
diff --git a/src/views/wcs/subtaskTemplate/index.vue b/src/views/wcs/subtaskTemplate/index.vue
index 69986cd..c8bf4b2 100644
--- a/src/views/wcs/subtaskTemplate/index.vue
+++ b/src/views/wcs/subtaskTemplate/index.vue
@@ -10,27 +10,58 @@
             <el-form-item label="子任务名称" prop="subtaskName">
               <el-input v-model="queryParams.subtaskName" placeholder="请输入子任务名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
+            <el-form-item label="子任务类型" prop="subtaskType">
+              <el-select v-model="queryParams.subtaskType" placeholder="请选择子任务类型" clearable>
+                <el-option v-for="dict in subtask_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="设备类型" prop="deviceType">
+              <el-select v-model="queryParams.deviceType" placeholder="请选择设备类型" clearable>
+                <el-option v-for="dict in subtask_device_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
             <el-form-item label="设备动作" prop="deviceAction">
               <el-input v-model="queryParams.deviceAction" placeholder="请输入设备动作" clearable @keyup.enter="handleQuery" />
             </el-form-item>
+            <el-form-item label="源位置类型" prop="sourceLocationType">
+              <el-select v-model="queryParams.sourceLocationType" placeholder="请选择源位置类型" clearable>
+                <el-option v-for="dict in location_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
             <el-form-item label="源位置编码模板" prop="sourceLocationCode">
               <el-input v-model="queryParams.sourceLocationCode" placeholder="请输入源位置编码模板" clearable @keyup.enter="handleQuery" />
             </el-form-item>
+            <el-form-item label="目标位置类型" prop="targetLocationType">
+              <el-select v-model="queryParams.targetLocationType" placeholder="请选择目标位置类型" clearable>
+                <el-option v-for="dict in location_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
             <el-form-item label="目标位置编码模板" prop="targetLocationCode">
               <el-input v-model="queryParams.targetLocationCode" placeholder="请输入目标位置编码模板" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="物料操作" prop="materialAction">
-              <el-input v-model="queryParams.materialAction" placeholder="请输入物料操作" clearable @keyup.enter="handleQuery" />
+              <el-select v-model="queryParams.materialAction" placeholder="请选择物料操作" clearable>
+                <el-option v-for="dict in material_action" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="容器类型" prop="containerType">
+              <el-select v-model="queryParams.containerType" placeholder="请选择容器类型" clearable>
+                <el-option v-for="dict in container_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
             </el-form-item>
             <el-form-item label="是否携带物料" prop="isCarryMaterial">
-              <el-input v-model="queryParams.isCarryMaterial" placeholder="请输入是否携带物料" clearable @keyup.enter="handleQuery" />
+              <el-select v-model="queryParams.isCarryMaterial" placeholder="请选择" clearable>
+                <el-option v-for="dict in carry_material" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
+              <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
+                <el-option v-for="dict in enable_status" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+              </el-select>
             </el-form-item>
             <el-form-item label="必需的参数列表" prop="requiredParams">
               <el-input v-model="queryParams.requiredParams" placeholder="请输入必需的参数列表" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="逻辑删除标志" prop="isDeleted">
-              <el-input v-model="queryParams.isDeleted" placeholder="请输入逻辑删除标志" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
             <el-form-item label="创建时间" prop="createtime">
               <el-date-picker clearable
                 v-model="queryParams.createtime"
@@ -72,18 +103,50 @@
         <el-table-column v-if="columns[0].visible" type="index" label="序号" width="60" align="center" />
         <el-table-column v-if="columns[1].visible" label="子任务编码" align="center" prop="subtaskCode" min-width="130" :show-overflow-tooltip="true" />
         <el-table-column v-if="columns[2].visible" label="子任务名称" align="center" prop="subtaskName" min-width="150" :show-overflow-tooltip="true" />
-        <el-table-column v-if="columns[3].visible" label="子任务类型" align="center" prop="subtaskType" min-width="120" :show-overflow-tooltip="true" />
-        <el-table-column v-if="columns[4].visible" label="设备类型" align="center" prop="deviceType" min-width="120" :show-overflow-tooltip="true" />
+        <el-table-column v-if="columns[3].visible" label="子任务类型" align="center" prop="subtaskType" min-width="120" :show-overflow-tooltip="true">
+          <template #default="scope">
+            <dict-tag :options="subtask_type" :value="scope.row.subtaskType" />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="columns[4].visible" label="设备类型" align="center" prop="deviceType" min-width="120" :show-overflow-tooltip="true">
+          <template #default="scope">
+            <dict-tag :options="subtask_device_type" :value="scope.row.deviceType" />
+          </template>
+        </el-table-column>
         <el-table-column v-if="columns[5].visible" label="设备动作" align="center" prop="deviceAction" min-width="120" :show-overflow-tooltip="true" />
-        <el-table-column v-if="columns[6].visible" label="源位置类型" align="center" prop="sourceLocationType" min-width="120" />
+        <el-table-column v-if="columns[6].visible" label="源位置类型" align="center" prop="sourceLocationType" min-width="120">
+          <template #default="scope">
+            <dict-tag :options="location_type" :value="scope.row.sourceLocationType" />
+          </template>
+        </el-table-column>
         <el-table-column v-if="columns[7].visible" label="源位置模板" align="center" prop="sourceLocationCode" min-width="150" :show-overflow-tooltip="true" />
-        <el-table-column v-if="columns[8].visible" label="目标位置类型" align="center" prop="targetLocationType" min-width="120" />
+        <el-table-column v-if="columns[8].visible" label="目标位置类型" align="center" prop="targetLocationType" min-width="120">
+          <template #default="scope">
+            <dict-tag :options="location_type" :value="scope.row.targetLocationType" />
+          </template>
+        </el-table-column>
         <el-table-column v-if="columns[9].visible" label="目标位置模板" align="center" prop="targetLocationCode" min-width="150" :show-overflow-tooltip="true" />
-        <el-table-column v-if="columns[10].visible" label="物料操作" align="center" prop="materialAction" width="110" />
-        <el-table-column v-if="columns[11].visible" label="容器类型" align="center" prop="containerType" width="110" />
-        <el-table-column v-if="columns[12].visible" label="携带物料" align="center" prop="isCarryMaterial" width="100" />
+        <el-table-column v-if="columns[10].visible" label="物料操作" align="center" prop="materialAction" width="110">
+          <template #default="scope">
+            <dict-tag :options="material_action" :value="scope.row.materialAction" />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="columns[11].visible" label="容器类型" align="center" prop="containerType" width="110">
+          <template #default="scope">
+            <dict-tag :options="container_type" :value="scope.row.containerType" />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="columns[12].visible" label="携带物料" align="center" prop="isCarryMaterial" width="100">
+          <template #default="scope">
+            <dict-tag :options="carry_material" :value="scope.row.isCarryMaterial" />
+          </template>
+        </el-table-column>
         <el-table-column v-if="columns[13].visible" label="必需参数" align="center" prop="requiredParams" min-width="160" :show-overflow-tooltip="true" />
-        <el-table-column v-if="columns[14].visible" label="状态" align="center" prop="status" width="90" />
+        <el-table-column v-if="columns[14].visible" label="状态" align="center" prop="status" width="90">
+          <template #default="scope">
+            <dict-tag :options="enable_status" :value="scope.row.status" />
+          </template>
+        </el-table-column>
         <el-table-column v-if="columns[15].visible" label="备注" align="center" prop="remark" min-width="160" :show-overflow-tooltip="true" />
         <el-table-column v-if="columns[16].visible" label="创建时间" align="center" prop="createtime" width="170">
           <template #default="scope">
@@ -115,27 +178,58 @@
         <el-form-item label="子任务名称" prop="subtaskName">
           <el-input v-model="form.subtaskName" placeholder="请输入子任务名称" />
         </el-form-item>
+        <el-form-item label="子任务类型" prop="subtaskType">
+          <el-select v-model="form.subtaskType" placeholder="请选择子任务类型">
+            <el-option v-for="dict in subtask_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设备类型" prop="deviceType">
+          <el-select v-model="form.deviceType" placeholder="请选择设备类型">
+            <el-option v-for="dict in subtask_device_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="设备动作" prop="deviceAction">
           <el-input v-model="form.deviceAction" placeholder="请输入设备动作" />
         </el-form-item>
+        <el-form-item label="源位置类型" prop="sourceLocationType">
+          <el-select v-model="form.sourceLocationType" placeholder="请选择源位置类型" clearable>
+            <el-option v-for="dict in location_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="源位置编码模板" prop="sourceLocationCode">
           <el-input v-model="form.sourceLocationCode" placeholder="请输入源位置编码模板" />
         </el-form-item>
+        <el-form-item label="目标位置类型" prop="targetLocationType">
+          <el-select v-model="form.targetLocationType" placeholder="请选择目标位置类型" clearable>
+            <el-option v-for="dict in location_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="目标位置编码模板" prop="targetLocationCode">
           <el-input v-model="form.targetLocationCode" placeholder="请输入目标位置编码模板" />
         </el-form-item>
         <el-form-item label="物料操作" prop="materialAction">
-          <el-input v-model="form.materialAction" placeholder="请输入物料操作" />
+          <el-select v-model="form.materialAction" placeholder="请选择物料操作" clearable>
+            <el-option v-for="dict in material_action" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="容器类型" prop="containerType">
+          <el-select v-model="form.containerType" placeholder="请选择容器类型" clearable>
+            <el-option v-for="dict in container_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio v-for="dict in enable_status" :key="dict.value" :value="parseInt(dict.value)">{{ dict.label }}</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="是否携带物料" prop="isCarryMaterial">
-          <el-input v-model="form.isCarryMaterial" placeholder="请输入是否携带物料" />
+          <el-radio-group v-model="form.isCarryMaterial">
+            <el-radio v-for="dict in carry_material" :key="dict.value" :value="parseInt(dict.value)">{{ dict.label }}</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="必需的参数列表" prop="requiredParams">
             <el-input v-model="form.requiredParams" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="逻辑删除标志" prop="isDeleted">
-          <el-input v-model="form.isDeleted" placeholder="请输入逻辑删除标志" />
-        </el-form-item>
         <el-form-item label="备注" prop="remark">
             <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -163,6 +257,10 @@ import { listSubtaskTemplate, getSubtaskTemplate, delSubtaskTemplate, addSubtask
 import { SubtaskTemplateVO, SubtaskTemplateQuery, SubtaskTemplateForm } from '@/api/wcs/subtaskTemplate/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+// 与 BaseSubtaskTemplateVo @ExcelDictFormat 对齐，调度模板的枚举值统一走系统字典，避免页面硬编码流转规则。
+const { subtask_type, subtask_device_type, location_type, material_action, container_type, carry_material, enable_status } = toRefs<any>(
+  proxy?.useDict('subtask_type', 'subtask_device_type', 'location_type', 'material_action', 'container_type', 'carry_material', 'enable_status')
+);
 
 const subtaskTemplateList = ref<SubtaskTemplateVO[]>([]);
 const buttonLoading = ref(false);
diff --git a/src/views/wcs/taskInstance/index.vue b/src/views/wcs/taskInstance/index.vue
index 3ff72e6..c52ab04 100644
--- a/src/views/wcs/taskInstance/index.vue
+++ b/src/views/wcs/taskInstance/index.vue
@@ -17,10 +17,14 @@
               <el-input v-model="queryParams.taskTypeName" placeholder="请输入任务类型名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="任务状态" prop="status">
-              <el-input v-model="queryParams.status" placeholder="请输入任务状态" clearable @keyup.enter="handleQuery" />
+              <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
+                <el-option v-for="dict in task_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
             </el-form-item>
             <el-form-item label="优先级" prop="priority">
-              <el-input-number v-model="queryParams.priority" :min="0" :controls="false" placeholder="请输入优先级" />
+              <el-select v-model="queryParams.priority" placeholder="请选择优先级" clearable>
+                <el-option v-for="dict in task_priority" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+              </el-select>
             </el-form-item>
             <el-form-item label="源位置" prop="sourceLocation">
               <el-input v-model="queryParams.sourceLocation" placeholder="请输入源位置" clearable @keyup.enter="handleQuery" />
@@ -95,8 +99,16 @@
         <el-table-column v-if="columns[2].visible" label="任务名称" align="center" prop="taskName" min-width="150" :show-overflow-tooltip="true" />
         <el-table-column v-if="columns[3].visible" label="任务类型Key" align="center" prop="taskTypeKey" min-width="130" :show-overflow-tooltip="true" />
         <el-table-column v-if="columns[4].visible" label="任务类型名称" align="center" prop="taskTypeName" min-width="130" :show-overflow-tooltip="true" />
-        <el-table-column v-if="columns[5].visible" label="任务状态" align="center" prop="status" width="110" />
-        <el-table-column v-if="columns[6].visible" label="优先级" align="center" prop="priority" width="90" />
+        <el-table-column v-if="columns[5].visible" label="任务状态" align="center" prop="status" width="110">
+          <template #default="scope">
+            <dict-tag :options="task_status" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="columns[6].visible" label="优先级" align="center" prop="priority" width="90">
+          <template #default="scope">
+            <dict-tag :options="task_priority" :value="scope.row.priority" />
+          </template>
+        </el-table-column>
         <el-table-column v-if="columns[7].visible" label="源位置" align="center" prop="sourceLocation" min-width="140" :show-overflow-tooltip="true" />
         <el-table-column v-if="columns[8].visible" label="目标位置" align="center" prop="targetLocation" min-width="140" :show-overflow-tooltip="true" />
         <el-table-column v-if="columns[9].visible" label="物料编码" align="center" prop="materialCode" min-width="120" :show-overflow-tooltip="true" />
@@ -145,10 +157,14 @@
           <el-input v-model="form.taskTypeName" placeholder="请输入任务类型名称" />
         </el-form-item>
         <el-form-item label="任务状态" prop="status">
-          <el-input v-model="form.status" placeholder="请输入任务状态，如 PENDING" />
+          <el-select v-model="form.status" placeholder="请选择任务状态">
+            <el-option v-for="dict in task_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
         </el-form-item>
         <el-form-item label="优先级" prop="priority">
-          <el-input-number v-model="form.priority" :min="0" :controls="false" class="w-full" placeholder="请输入优先级" />
+          <el-select v-model="form.priority" placeholder="请选择优先级">
+            <el-option v-for="dict in task_priority" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+          </el-select>
         </el-form-item>
         <el-form-item label="源位置" prop="sourceLocation">
           <el-input v-model="form.sourceLocation" placeholder="请输入源位置" />
@@ -199,6 +215,7 @@ import { listTaskInstance, getTaskInstance, delTaskInstance, addTaskInstance, up
 import { TaskInstanceVO, TaskInstanceQuery, TaskInstanceForm } from '@/api/wcs/taskInstance/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { task_status, task_priority } = toRefs<any>(proxy?.useDict('task_status', 'task_priority'));
 
 const taskInstanceList = ref<TaskInstanceVO[]>([]);
 const buttonLoading = ref(false);
diff --git a/src/views/wcs/tasktype/index.vue b/src/views/wcs/tasktype/index.vue
index 32d0976..989dceb 100644
--- a/src/views/wcs/tasktype/index.vue
+++ b/src/views/wcs/tasktype/index.vue
@@ -4,24 +4,28 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="字典名;字典名" prop="tasktypeName">
-              <el-input v-model="queryParams.tasktypeName" placeholder="请输入字典名;字典名" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="任务类型名称" prop="tasktypeName">
+              <el-input v-model="queryParams.tasktypeName" placeholder="请输入任务类型名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="对应名;对应名" prop="tasktypeKey">
-              <el-input v-model="queryParams.tasktypeKey" placeholder="请输入对应名;对应名" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="任务类型Key" prop="tasktypeKey">
+              <el-input v-model="queryParams.tasktypeKey" placeholder="请输入任务类型Key" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="模板;模板" prop="tasktypeValue">
-              <el-input v-model="queryParams.tasktypeValue" placeholder="请输入模板;模板" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="模板值" prop="tasktypeValue">
+              <el-select v-model="queryParams.tasktypeValue" placeholder="请选择模板值" clearable>
+                <el-option v-for="dict in tasktype_value" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
             </el-form-item>
-            <el-form-item label="是否可用  0:不可用  1:可用;是否可用  0:不可用  1:可用" prop="useFlag">
-              <el-input v-model="queryParams.useFlag" placeholder="请输入是否可用  0:不可用  1:可用;是否可用  0:不可用  1:可用" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="可用标识" prop="useFlag">
+              <el-select v-model="queryParams.useFlag" placeholder="请选择可用标识" clearable>
+                <el-option v-for="dict in use_flag" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+              </el-select>
             </el-form-item>
-            <el-form-item label="创建时间;创建时间" prop="createdTime">
+            <el-form-item label="创建时间" prop="createdTime">
               <el-date-picker clearable
                 v-model="queryParams.createdTime"
                 type="date"
                 value-format="YYYY-MM-DD"
-                placeholder="请选择创建时间;创建时间"
+                placeholder="请选择创建时间"
               />
             </el-form-item>
             <el-form-item>
@@ -57,10 +61,26 @@
         <el-table-column v-if="columns[0].visible" type="index" label="序号" width="60" align="center" />
         <el-table-column v-if="columns[1].visible" label="任务类型名称" align="center" prop="tasktypeName" min-width="130" :show-overflow-tooltip="true" />
         <el-table-column v-if="columns[2].visible" label="任务类型Key" align="center" prop="tasktypeKey" min-width="130" :show-overflow-tooltip="true" />
-        <el-table-column v-if="columns[3].visible" label="模板值" align="center" prop="tasktypeValue" width="110" />
-        <el-table-column v-if="columns[4].visible" label="可用标识" align="center" prop="useFlag" width="100" />
-        <el-table-column v-if="columns[5].visible" label="AGV取放类型" align="center" prop="agvType" min-width="120" :show-overflow-tooltip="true" />
-        <el-table-column v-if="columns[6].visible" label="AGV任务类型" align="center" prop="agvTaskType" min-width="120" :show-overflow-tooltip="true" />
+        <el-table-column v-if="columns[3].visible" label="模板值" align="center" prop="tasktypeValue" width="110">
+          <template #default="scope">
+            <dict-tag :options="tasktype_value" :value="scope.row.tasktypeValue" />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="columns[4].visible" label="可用标识" align="center" prop="useFlag" width="100">
+          <template #default="scope">
+            <dict-tag :options="use_flag" :value="scope.row.useFlag" />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="columns[5].visible" label="AGV取放类型" align="center" prop="agvType" min-width="120" :show-overflow-tooltip="true">
+          <template #default="scope">
+            <dict-tag :options="agv_type" :value="scope.row.agvType" />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="columns[6].visible" label="AGV任务类型" align="center" prop="agvTaskType" min-width="120" :show-overflow-tooltip="true">
+          <template #default="scope">
+            <dict-tag :options="agv_task_type" :value="scope.row.agvTaskType" />
+          </template>
+        </el-table-column>
         <el-table-column v-if="columns[7].visible" label="创建人" align="center" prop="createdBy" width="110" />
         <el-table-column v-if="columns[8].visible" label="创建时间" align="center" prop="createdTime" width="170">
           <template #default="scope">
@@ -85,24 +105,38 @@
     <!-- 添加或修改字典对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="tasktypeFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="字典名;字典名" prop="tasktypeName">
-          <el-input v-model="form.tasktypeName" placeholder="请输入字典名;字典名" />
+        <el-form-item label="任务类型名称" prop="tasktypeName">
+          <el-input v-model="form.tasktypeName" placeholder="请输入任务类型名称" />
         </el-form-item>
-        <el-form-item label="对应名;对应名" prop="tasktypeKey">
-          <el-input v-model="form.tasktypeKey" placeholder="请输入对应名;对应名" />
+        <el-form-item label="任务类型Key" prop="tasktypeKey">
+          <el-input v-model="form.tasktypeKey" placeholder="请输入任务类型Key" />
         </el-form-item>
-        <el-form-item label="模板;模板" prop="tasktypeValue">
-          <el-input v-model="form.tasktypeValue" placeholder="请输入模板;模板" />
+        <el-form-item label="模板值" prop="tasktypeValue">
+          <el-select v-model="form.tasktypeValue" placeholder="请选择模板值" clearable>
+            <el-option v-for="dict in tasktype_value" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
         </el-form-item>
-        <el-form-item label="是否可用  0:不可用  1:可用;是否可用  0:不可用  1:可用" prop="useFlag">
-          <el-input v-model="form.useFlag" placeholder="请输入是否可用  0:不可用  1:可用;是否可用  0:不可用  1:可用" />
+        <el-form-item label="可用标识" prop="useFlag">
+          <el-radio-group v-model="form.useFlag">
+            <el-radio v-for="dict in use_flag" :key="dict.value" :value="parseInt(dict.value)">{{ dict.label }}</el-radio>
+          </el-radio-group>
         </el-form-item>
-        <el-form-item label="创建时间;创建时间" prop="createdTime">
+        <el-form-item label="AGV取放类型" prop="agvType">
+          <el-select v-model="form.agvType" placeholder="请选择AGV取放类型" clearable>
+            <el-option v-for="dict in agv_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="AGV任务类型" prop="agvTaskType">
+          <el-select v-model="form.agvTaskType" placeholder="请选择AGV任务类型" clearable>
+            <el-option v-for="dict in agv_task_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createdTime">
           <el-date-picker clearable
             v-model="form.createdTime"
             type="datetime"
             value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择创建时间;创建时间">
+            placeholder="请选择创建时间">
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -121,6 +155,7 @@ import { listTasktype, getTasktype, delTasktype, addTasktype, updateTasktype } f
 import { TasktypeVO, TasktypeQuery, TasktypeForm } from '@/api/wcs/tasktype/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { tasktype_value, use_flag, agv_type, agv_task_type } = toRefs<any>(proxy?.useDict('tasktype_value', 'use_flag', 'agv_type', 'agv_task_type'));
 
 const tasktypeList = ref<TasktypeVO[]>([]);
 const buttonLoading = ref(false);
@@ -180,7 +215,7 @@ const data = reactive<PageData<TasktypeForm, TasktypeQuery>>({
   },
   rules: {
     id: [
-      { required: true, message: "主键;主键不能为空", trigger: "blur" }
+      { required: true, message: "记录不能为空", trigger: "blur" }
     ],
   }
 });
diff --git a/src/views/wcs/warehouse/Reference.vue b/src/views/wcs/warehouse/Reference.vue
new file mode 100644
index 0000000..1a72989
--- /dev/null
+++ b/src/views/wcs/warehouse/Reference.vue
@@ -0,0 +1,284 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="存放类型" prop="warehouseType">
+              <el-select v-model="queryParams.warehouseType" placeholder="请选择存放类型" clearable >
+                <el-option v-for="dict in warehouse_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="所属车间编号" prop="workshopId">
+              <el-input v-model="queryParams.workshopId" placeholder="请输入所属车间编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="楼层" prop="workshopLevel">
+              <el-input v-model="queryParams.workshopLevel" placeholder="请输入楼层" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="仓库编码" prop="warehouseCode">
+              <el-input v-model="queryParams.warehouseCode" placeholder="请输入仓库编码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="仓库名称" prop="warehouseName">
+              <el-input v-model="queryParams.warehouseName" placeholder="请输入仓库名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="激活标记" prop="activeFlag">
+              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标记" clearable >
+                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['wcs:warehouse:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['wcs:warehouse:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['wcs:warehouse:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['wcs:warehouse:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="warehouseList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="仓库ID;仓库ID" align="center" prop="warehouseId" v-if="true" />
+        <el-table-column label="存放类型" align="center" prop="warehouseType">
+          <template #default="scope">
+            <dict-tag :options="warehouse_type" :value="scope.row.warehouseType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="所属车间编号" align="center" prop="workshopId" />
+        <el-table-column label="楼层" align="center" prop="workshopLevel" />
+        <el-table-column label="仓库编码" align="center" prop="warehouseCode" />
+        <el-table-column label="仓库名称" align="center" prop="warehouseName" />
+        <el-table-column label="激活标记" align="center" prop="activeFlag">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建者;创建者" align="center" prop="createBy" />
+        <el-table-column label="更新者" align="center" prop="updateBy" />
+        <el-table-column label="操作" align="center" fixed="right"  class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['wcs:warehouse:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['wcs:warehouse:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改仓库信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="warehouseFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="存放类型" prop="warehouseType">
+          <el-select v-model="form.warehouseType" placeholder="请选择存放类型">
+            <el-option
+                v-for="dict in warehouse_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="所属车间编号" prop="workshopId">
+          <el-input v-model="form.workshopId" placeholder="请输入所属车间编号" />
+        </el-form-item>
+        <el-form-item label="楼层" prop="workshopLevel">
+          <el-input v-model="form.workshopLevel" placeholder="请输入楼层" />
+        </el-form-item>
+        <el-form-item label="仓库编码" prop="warehouseCode">
+          <el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
+        </el-form-item>
+        <el-form-item label="仓库名称" prop="warehouseName">
+          <el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
+        </el-form-item>
+        <el-form-item label="激活标记" prop="activeFlag">
+          <el-radio-group v-model="form.activeFlag">
+            <el-radio
+              v-for="dict in active_flag"
+              :key="dict.value"
+              :value="parseInt(dict.value)"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Warehouse" lang="ts">
+import { listWarehouse, getWarehouse, delWarehouse, addWarehouse, updateWarehouse } from '@/api/wcs/warehouse';
+import { WarehouseVO, WarehouseQuery, WarehouseForm } from '@/api/wcs/warehouse/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { warehouse_type, active_flag } = toRefs<any>(proxy?.useDict('warehouse_type', 'active_flag'));
+
+const warehouseList = ref<WarehouseVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const warehouseFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: WarehouseForm = {
+  warehouseId: undefined,
+  warehouseType: undefined,
+  workshopId: undefined,
+  workshopLevel: undefined,
+  warehouseCode: undefined,
+  warehouseName: undefined,
+  activeFlag: undefined,
+}
+const data = reactive<PageData<WarehouseForm, WarehouseQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    warehouseType: undefined,
+    workshopId: undefined,
+    workshopLevel: undefined,
+    warehouseCode: undefined,
+    warehouseName: undefined,
+    activeFlag: undefined,
+    params: {
+    }
+  },
+  rules: {
+    warehouseId: [
+      { required: true, message: "仓库ID;仓库ID不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询仓库信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listWarehouse(queryParams.value);
+  warehouseList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  warehouseFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: WarehouseVO[]) => {
+  ids.value = selection.map(item => item.warehouseId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加仓库信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: WarehouseVO) => {
+  reset();
+  const _warehouseId = row?.warehouseId || ids.value[0]
+  const res = await getWarehouse(_warehouseId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改仓库信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  warehouseFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.warehouseId) {
+        await updateWarehouse(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addWarehouse(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: WarehouseVO) => {
+  const _warehouseIds = row?.warehouseId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除仓库信息编号为"' + _warehouseIds + '"的数据项？').finally(() => loading.value = false);
+  await delWarehouse(_warehouseIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('wcs/warehouse/export', {
+    ...queryParams.value
+  }, `warehouse_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/wcs/warehouse/index.vue b/src/views/wcs/warehouse/index.vue
index 5ff895b..7eddbca 100644
--- a/src/views/wcs/warehouse/index.vue
+++ b/src/views/wcs/warehouse/index.vue
@@ -5,7 +5,9 @@
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="存放类型" prop="warehouseType">
-              <el-input-number v-model="queryParams.warehouseType" :min="0" :controls="false" placeholder="请输入存放类型" />
+              <el-select v-model="queryParams.warehouseType" placeholder="请选择存放类型" clearable>
+                <el-option v-for="dict in warehouse_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
             </el-form-item>
             <el-form-item label="车间编号" prop="workshopId">
               <el-input-number v-model="queryParams.workshopId" :min="0" :controls="false" placeholder="请输入车间编号" />
@@ -20,7 +22,9 @@
               <el-input v-model="queryParams.warehouseName" placeholder="请输入仓库名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="激活标记" prop="activeFlag">
-              <el-input-number v-model="queryParams.activeFlag" :min="0" :controls="false" placeholder="请输入激活标记" />
+              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标记" clearable>
+                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -53,12 +57,20 @@
       <el-table v-loading="loading" border :data="warehouseList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column v-if="columns[0].visible" type="index" label="序号" width="60" align="center" />
-        <el-table-column v-if="columns[1].visible" label="存放类型" align="center" prop="warehouseType" width="100" />
+        <el-table-column v-if="columns[1].visible" label="存放类型" align="center" prop="warehouseType" width="110">
+          <template #default="scope">
+            <dict-tag :options="warehouse_type" :value="scope.row.warehouseType" />
+          </template>
+        </el-table-column>
         <el-table-column v-if="columns[2].visible" label="车间编号" align="center" prop="workshopId" width="100" />
         <el-table-column v-if="columns[3].visible" label="车间层数" align="center" prop="workshopLevel" width="100" />
         <el-table-column v-if="columns[4].visible" label="仓库编码" align="center" prop="warehouseCode" min-width="130" :show-overflow-tooltip="true" />
         <el-table-column v-if="columns[5].visible" label="仓库名称" align="center" prop="warehouseName" min-width="150" :show-overflow-tooltip="true" />
-        <el-table-column v-if="columns[6].visible" label="激活标记" align="center" prop="activeFlag" width="100" />
+        <el-table-column v-if="columns[6].visible" label="激活标记" align="center" prop="activeFlag" width="100">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag" />
+          </template>
+        </el-table-column>
         <el-table-column v-if="columns[7].visible" label="创建人" align="center" prop="createBy" width="110" />
         <el-table-column v-if="columns[8].visible" label="创建时间" align="center" prop="createTime" width="170">
           <template #default="scope">
@@ -84,7 +96,9 @@
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="warehouseFormRef" :model="form" :rules="rules" label-width="90px">
         <el-form-item label="存放类型" prop="warehouseType">
-          <el-input-number v-model="form.warehouseType" :min="0" :controls="false" class="w-full" placeholder="请输入存放类型" />
+          <el-select v-model="form.warehouseType" placeholder="请选择存放类型" class="w-full">
+            <el-option v-for="dict in warehouse_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+          </el-select>
         </el-form-item>
         <el-form-item label="车间编号" prop="workshopId">
           <el-input-number v-model="form.workshopId" :min="0" :controls="false" class="w-full" placeholder="请输入车间编号" />
@@ -99,7 +113,9 @@
           <el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
         </el-form-item>
         <el-form-item label="激活标记" prop="activeFlag">
-          <el-input-number v-model="form.activeFlag" :min="0" :controls="false" class="w-full" placeholder="请输入激活标记" />
+          <el-radio-group v-model="form.activeFlag">
+            <el-radio v-for="dict in active_flag" :key="dict.value" :value="parseInt(dict.value)">{{ dict.label }}</el-radio>
+          </el-radio-group>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -117,6 +133,8 @@ import { listWarehouse, getWarehouse, delWarehouse, addWarehouse, updateWarehous
 import { WarehouseVO, WarehouseQuery, WarehouseForm } from '@/api/wcs/warehouse/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+// 依赖后端 sys_dict_data 中的 warehouse_type / active_flag，与 VO @ExcelDictFormat 保持一致。
+const { warehouse_type, active_flag } = toRefs<any>(proxy?.useDict('warehouse_type', 'active_flag'));
 
 const warehouseList = ref<WarehouseVO[]>([]);
 const buttonLoading = ref(false);
@@ -174,7 +192,7 @@ const data = reactive<PageData<WarehouseForm, WarehouseQuery>>({
   },
   rules: {
     warehouseId: [
-      { required: true, message: "仓库ID;仓库ID不能为空", trigger: "blur" }
+      { required: true, message: "仓库信息不能为空", trigger: "blur" }
     ],
   }
 });