From 5ec0b03a8e338c04920b374c1f1983fc207a5cd5 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Tue, 25 Jun 2024 00:21:18 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20:recycle:=20=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/index.vue |  2 +-
 src/views/system/dict/index.vue |  4 ----
 src/views/system/menu/index.vue |  6 ++----
 src/views/system/role/index.vue | 12 ++++++------
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index d956aca0..e9234e33 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -90,7 +90,7 @@
             </el-button>
             <el-button
               v-hasPerm="['sys:dept:delete']"
-              type="primary"
+              type="danger"
               link
               size="small"
               @click.stop="handleDelete(scope.row.id)"
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 2b0a91e4..9e69f0b7 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -119,10 +119,6 @@
               <el-radio :value="0">禁用</el-radio>
             </el-radio-group>
           </el-form-item>
-
-          <el-form-item label="备注">
-            <el-input v-model="formData.remark" />
-          </el-form-item>
         </el-card>
 
         <el-card shadow="never" class="mt-5">
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 9f0ef2f7..e67ad2ad 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -208,10 +208,7 @@
         </el-form-item>
 
         <el-form-item
-          v-if="
-            formData.type == MenuTypeEnum.CATALOG ||
-            formData.type == MenuTypeEnum.MENU
-          "
+          v-if="formData.type == MenuTypeEnum.MENU"
           prop="routeName"
         >
           <template #label>
@@ -486,6 +483,7 @@ const rules = reactive({
   parentId: [{ required: true, message: "请选择顶级菜单", trigger: "blur" }],
   name: [{ required: true, message: "请输入菜单名称", trigger: "blur" }],
   type: [{ required: true, message: "请选择菜单类型", trigger: "blur" }],
+  routeName: [{ required: true, message: "请输入路由名称", trigger: "blur" }],
   routePath: [{ required: true, message: "请输入路由路径", trigger: "blur" }],
   component: [{ required: true, message: "请输入组件路径", trigger: "blur" }],
   visible: [{ required: true, message: "请输入路由路径", trigger: "blur" }],
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index d332e135..968a1173 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -73,7 +73,7 @@
               <i-ep-edit />编辑
             </el-button>
             <el-button
-              type="primary"
+              type="danger"
               size="small"
               link
               @click="handleDelete(scope.row.id)"
@@ -275,7 +275,7 @@ const isExpanded = ref(true);
 
 const parentChildLinked = ref(true);
 
-// 查询
+/** 查询 */
 function handleQuery() {
   loading.value = true;
   RoleAPI.getPage(queryParams)
@@ -287,19 +287,19 @@ function handleQuery() {
       loading.value = false;
     });
 }
-// 重置查询
+/** 重置查询 */
 function handleResetQuery() {
   queryFormRef.value.resetFields();
   queryParams.pageNum = 1;
   handleQuery();
 }
 
-// 行选中事件
+/** 行选中 */
 function handleSelectionChange(selection: any) {
   ids.value = selection.map((item: any) => item.id);
 }
 
-// 打开弹窗
+/** 打开角色弹窗 */
 function handleOpenDialog(roleId?: number) {
   dialog.visible = true;
   if (roleId) {
@@ -339,7 +339,7 @@ function handleSubmit() {
   });
 }
 
-/** 关闭表单弹窗 */
+/** 关闭角色弹窗 */
 function handleCloseDialog() {
   dialog.visible = false;