From c89ba258bcea60f6bb7c6bceb782495b7e1a1a40 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 11 十二月 2024 11:20:59 +0800
Subject: [PATCH] 用户管理过滤掉已禁用部门(IB5H7F)

---
 src/views/system/menu/index.vue |   51 ++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 4e44430..2d15eec 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -102,13 +102,13 @@
                <el-col :span="24">
                   <el-form-item label="鑿滃崟绫诲瀷" prop="menuType">
                      <el-radio-group v-model="form.menuType">
-                        <el-radio label="M">鐩綍</el-radio>
-                        <el-radio label="C">鑿滃崟</el-radio>
-                        <el-radio label="F">鎸夐挳</el-radio>
+                        <el-radio value="M">鐩綍</el-radio>
+                        <el-radio value="C">鑿滃崟</el-radio>
+                        <el-radio value="F">鎸夐挳</el-radio>
                      </el-radio-group>
                   </el-form-item>
                </el-col>
-               <el-col :span="24" v-if="form.menuType != 'F'">
+               <el-col :span="12" v-if="form.menuType != 'F'">
                   <el-form-item label="鑿滃崟鍥炬爣" prop="icon">
                      <el-popover
                         placement="bottom-start"
@@ -133,13 +133,26 @@
                   </el-form-item>
                </el-col>
                <el-col :span="12">
+                  <el-form-item label="鏄剧ず鎺掑簭" prop="orderNum">
+                     <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+                  </el-form-item>
+               </el-col>
+               <el-col :span="12">
                   <el-form-item label="鑿滃崟鍚嶇О" prop="menuName">
                      <el-input v-model="form.menuName" placeholder="璇疯緭鍏ヨ彍鍗曞悕绉�" />
                   </el-form-item>
                </el-col>
-               <el-col :span="12">
-                  <el-form-item label="鏄剧ず鎺掑簭" prop="orderNum">
-                     <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+               <el-col :span="12" v-if="form.menuType == 'C'">
+                  <el-form-item prop="routeName">
+                     <template #label>
+                        <span>
+                           <el-tooltip content="榛樿涓嶅~鍒欏拰璺敱鍦板潃鐩稿悓锛氬鍦板潃涓猴細`user`锛屽垯鍚嶇О涓篳User`锛堟敞鎰忥細鍥犱负router浼氬垹闄ゅ悕绉扮浉鍚岃矾鐢憋紝涓洪伩鍏嶅悕瀛楃殑鍐茬獊锛岀壒娈婃儏鍐典笅璇疯嚜瀹氫箟锛屼繚璇佸敮涓�鎬э級" placement="top">
+                              <el-icon><question-filled /></el-icon>
+                           </el-tooltip>
+                           璺敱鍚嶇О
+                        </span>
+                     </template>
+                     <el-input v-model="form.routeName" placeholder="璇疯緭鍏ヨ矾鐢卞悕绉�" />
                   </el-form-item>
                </el-col>
                <el-col :span="12" v-if="form.menuType != 'F'">
@@ -152,8 +165,8 @@
                         </span>
                      </template>
                      <el-radio-group v-model="form.isFrame">
-                        <el-radio label="0">鏄�</el-radio>
-                        <el-radio label="1">鍚�</el-radio>
+                        <el-radio value="0">鏄�</el-radio>
+                        <el-radio value="1">鍚�</el-radio>
                      </el-radio-group>
                   </el-form-item>
                </el-col>
@@ -220,8 +233,8 @@
                         </span>
                      </template>
                      <el-radio-group v-model="form.isCache">
-                        <el-radio label="0">缂撳瓨</el-radio>
-                        <el-radio label="1">涓嶇紦瀛�</el-radio>
+                        <el-radio value="0">缂撳瓨</el-radio>
+                        <el-radio value="1">涓嶇紦瀛�</el-radio>
                      </el-radio-group>
                   </el-form-item>
                </el-col>
@@ -239,7 +252,7 @@
                         <el-radio
                            v-for="dict in sys_show_hide"
                            :key="dict.value"
-                           :label="dict.value"
+                           :value="dict.value"
                         >{{ dict.label }}</el-radio>
                      </el-radio-group>
                   </el-form-item>
@@ -258,7 +271,7 @@
                         <el-radio
                            v-for="dict in sys_normal_disable"
                            :key="dict.value"
-                           :label="dict.value"
+                           :value="dict.value"
                         >{{ dict.label }}</el-radio>
                      </el-radio-group>
                   </el-form-item>
@@ -316,6 +329,7 @@
     loading.value = false;
   });
 }
+
 /** 鏌ヨ鑿滃崟涓嬫媺鏍戠粨鏋� */
 function getTreeselect() {
   menuOptions.value = [];
@@ -325,11 +339,13 @@
     menuOptions.value.push(menu);
   });
 }
+
 /** 鍙栨秷鎸夐挳 */
 function cancel() {
   open.value = false;
   reset();
 }
+
 /** 琛ㄥ崟閲嶇疆 */
 function reset() {
   form.value = {
@@ -346,23 +362,28 @@
   };
   proxy.resetForm("menuRef");
 }
+
 /** 灞曠ず涓嬫媺鍥炬爣 */
 function showSelectIcon() {
   iconSelectRef.value.reset();
 }
+
 /** 閫夋嫨鍥炬爣 */
 function selected(name) {
   form.value.icon = name;
 }
+
 /** 鎼滅储鎸夐挳鎿嶄綔 */
 function handleQuery() {
   getList();
 }
+
 /** 閲嶇疆鎸夐挳鎿嶄綔 */
 function resetQuery() {
   proxy.resetForm("queryRef");
   handleQuery();
 }
+
 /** 鏂板鎸夐挳鎿嶄綔 */
 function handleAdd(row) {
   reset();
@@ -375,6 +396,7 @@
   open.value = true;
   title.value = "娣诲姞鑿滃崟";
 }
+
 /** 灞曞紑/鎶樺彔鎿嶄綔 */
 function toggleExpandAll() {
   refreshTable.value = false;
@@ -383,6 +405,7 @@
     refreshTable.value = true;
   });
 }
+
 /** 淇敼鎸夐挳鎿嶄綔 */
 async function handleUpdate(row) {
   reset();
@@ -393,6 +416,7 @@
     title.value = "淇敼鑿滃崟";
   });
 }
+
 /** 鎻愪氦鎸夐挳 */
 function submitForm() {
   proxy.$refs["menuRef"].validate(valid => {
@@ -413,6 +437,7 @@
     }
   });
 }
+
 /** 鍒犻櫎鎸夐挳鎿嶄綔 */
 function handleDelete(row) {
   proxy.$modal.confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.menuName + '"鐨勬暟鎹」?').then(function() {

--
Gitblit v1.9.3