From 719669c666277bfef08a0eea3a880e6040aae009 Mon Sep 17 00:00:00 2001
From: ailanyin <ailanyin4j@163.com>
Date: Wed, 31 May 2023 21:22:52 +0800
Subject: [PATCH] update

---
 src/router/index.js             | 14 ++++++++++++++
 src/views/system/dict/data.vue  | 15 ++-------------
 src/views/system/dict/index.vue |  2 +-
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 8b17a5c..75ffdd3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -116,6 +116,20 @@ export const dynamicRoutes = [
       },
     ],
   },
+  {
+    path: '/system/dict-data',
+    component: Layout,
+    hidden: true,
+    permissions: ['system:dict:list'],
+    children: [
+      {
+        path: 'index/:dictId(\\d+)',
+        component: () => import('@/views/system/dict/data'),
+        name: 'Data',
+        meta: { title: '字典数据', activeMenu: '/system/dict' }
+      }
+    ]
+  },
 ];
 
 const router = createRouter({
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index b900666..f4eca42 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -1,16 +1,6 @@
 <template>
    <div class="app-container">
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-         <el-form-item label="字典名称" prop="dictType">
-            <el-select v-model="queryParams.dictType" style="width: 200px">
-               <el-option
-                  v-for="item in typeOptions"
-                  :key="item.dictId"
-                  :label="item.dictName"
-                  :value="item.dictType"
-               />
-            </el-select>
-         </el-form-item>
          <el-form-item label="字典标签" prop="dictLabel">
             <el-input
                v-model="queryParams.dictLabel"
@@ -179,9 +169,9 @@
 import useDictStore from '@/store/modules/dict'
 import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type";
 import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
+import { sys_normal_disable } from "@/constant/dict";
 
 const { proxy } = getCurrentInstance();
-const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 
 const dataList = ref([]);
 const open = ref(false);
@@ -261,7 +251,7 @@ function reset() {
     cssClass: undefined,
     listClass: "default",
     dictSort: 0,
-    status: "0",
+    status: "1",
     remark: undefined
   };
   proxy.resetForm("dataRef");
@@ -279,7 +269,6 @@ function handleClose() {
 /** 重置按钮操作 */
 function resetQuery() {
   proxy.resetForm("queryRef");
-  queryParams.value.dictType = defaultDictType;
   handleQuery();
 }
 /** 新增按钮操作 */
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index a68fd22..c37aa71 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -217,7 +217,7 @@ function reset() {
     dictId: undefined,
     dictName: undefined,
     dictType: undefined,
-    status: "0",
+    status: "1",
     remark: undefined
   };
   proxy.resetForm("dictRef");