From 46145ff636b531da01eeeb2c4434e885b685f8ec Mon Sep 17 00:00:00 2001
From: sindir <sindirhuang@gmail.com>
Date: Tue, 20 Jan 2026 16:19:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E8=BD=AC=E5=88=B0=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E7=B1=BB=E5=9E=8B=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 openhis-ui-vue3/src/router/index.js           |  26 +++
 .../src/views/system/dict/index.vue           | 160 ++++--------------
 2 files changed, 58 insertions(+), 128 deletions(-)

diff --git a/openhis-ui-vue3/src/router/index.js b/openhis-ui-vue3/src/router/index.js
index dada00a9..6092f6d2 100644
--- a/openhis-ui-vue3/src/router/index.js
+++ b/openhis-ui-vue3/src/router/index.js
@@ -96,6 +96,32 @@ export const dynamicRoutes = [
             },
         ],
     },
+        // 字典类型路由（直接复制这段）
+    {
+        path: '/system/dict',
+        component: Layout,
+        alwaysShow: true,
+        name: 'DictType',
+        meta: {
+            title: '字典类型管理',
+            icon: 'list' // 图标随便选一个，比如list、dict，不影响跳转
+        },
+        children: [
+            {
+                path: '',
+                component: () => import('@/views/system/dict/index.vue'),
+                name: 'DictTypeList',
+                meta: {title: '字典类型', noCache: false}
+            },
+            {
+                path: 'data/:dictId?', // 带字典ID参数，?表示可选
+                component: () => import('@/views/system/dict/data.vue'), // 你的data.vue路径
+                name: 'DictData',
+                hidden: true, // 不在侧边栏显示（子页面）
+                meta: {title: '字典数据', activeMenu: '/system/dict'} // 保持侧边栏高亮
+            }
+        ]
+    },
 ];
 
 // 合并常量路由和动态路由，确保所有路由都能被访问
diff --git a/openhis-ui-vue3/src/views/system/dict/index.vue b/openhis-ui-vue3/src/views/system/dict/index.vue
index c02555f8..a6db2ff1 100644
--- a/openhis-ui-vue3/src/views/system/dict/index.vue
+++ b/openhis-ui-vue3/src/views/system/dict/index.vue
@@ -1,55 +1,23 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-      class="query-form"
-    >
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px"
+      class="query-form">
       <el-form-item label="字典名称" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请输入字典名称"
-          clearable
-          style="width: 240px"
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.dictName" placeholder="请输入字典名称" clearable style="width: 240px"
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="字典类型" prop="dictType">
-        <el-input
-          v-model="queryParams.dictType"
-          placeholder="请输入字典类型"
-          clearable
-          style="width: 240px"
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.dictType" placeholder="请输入字典类型" clearable style="width: 240px"
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="字典状态"
-          clearable
-          style="width: 240px"
-        >
-          <el-option
-            v-for="dict in sys_normal_disable"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+        <el-select v-model="queryParams.status" placeholder="字典状态" clearable style="width: 240px">
+          <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker
-          v-model="dateRange"
-          value-format="YYYY-MM-DD"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
+        <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item class="search-buttons">
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -59,76 +27,34 @@
 
     <el-row :gutter="10" class="button-group">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['system:dict:add']"
-          >新增</el-button
-        >
+        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:dict:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:dict:edit']"
-          >修改</el-button
-        >
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['system:dict:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:dict:remove']"
-          >删除</el-button
-        >
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['system:dict:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['system:dict:export']"
-          >导出</el-button
-        >
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['system:dict:export']">导出</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Refresh"
-          @click="handleRefreshCache"
-          v-hasPermi="['system:dict:remove']"
-          >刷新缓存</el-button
-        >
+        <el-button type="danger" plain icon="Refresh" @click="handleRefreshCache"
+          v-hasPermi="['system:dict:remove']">刷新缓存</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <div class="table-wrapper">
-      <el-table
-        v-loading="loading"
-        :data="typeList"
-        @selection-change="handleSelectionChange"
-      >
+      <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="字典编号" align="center" prop="dictId" />
-        <el-table-column
-          label="字典名称"
-          align="center"
-          prop="dictName"
-          :show-overflow-tooltip="true"
-        />
+        <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
         <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
           <template #default="scope">
-            <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
+            <router-link :to="'/system/dict/data/' + scope.row.dictId" class="link-type">
               <span>{{ scope.row.dictType }}</span>
             </router-link>
           </template>
@@ -144,40 +70,18 @@
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          label="操作"
-          align="center"
-          width="160"
-          class-name="small-padding fixed-width"
-        >
+        <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button
-              link
-              type="primary"
-              icon="Edit"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['system:dict:edit']"
-              class="action-button">修改</el-button
-            >
-            <el-button
-              link
-              type="primary"
-              icon="Delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['system:dict:remove']"
-              class="action-button">删除</el-button
-            >
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['system:dict:edit']" class="action-button">修改</el-button>
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['system:dict:remove']" class="action-button">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
       <div class="pagination-container">
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          v-model:page="queryParams.pageNum"
-          v-model:limit="queryParams.pageSize"
-          @pagination="getList"
-        />
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize" @pagination="getList" />
       </div>
     </div>
 
@@ -194,7 +98,7 @@
           <el-radio-group v-model="form.status">
             <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{
               dict.label
-            }}</el-radio>
+              }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -213,7 +117,7 @@
 
 <script setup name="Dict">
 import useDictStore from '@/store/modules/dict';
-import {addType, delType, getType, listType, refreshCache, updateType,} from '@/api/system/dict/type';
+import { addType, delType, getType, listType, refreshCache, updateType, } from '@/api/system/dict/type';
 
 const { proxy } = getCurrentInstance();
 const { sys_normal_disable } = proxy.useDict('sys_normal_disable');
@@ -336,7 +240,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess('删除成功');
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 /** 导出按钮操作 */
 function handleExport() {