From 743fcab67473ccad571a56f2b9661aa4c9aff81f Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 26 Aug 2023 11:12:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user_menu/edit.vue  |  8 ++++++++
 src/views/user_menu/index.vue |  5 +++++
 src/views/user_role/auth.vue  | 14 +++++++++++++-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/views/user_menu/edit.vue b/src/views/user_menu/edit.vue
index 741a634..a026b1c 100644
--- a/src/views/user_menu/edit.vue
+++ b/src/views/user_menu/edit.vue
@@ -60,6 +60,13 @@
             <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
           </el-upload>
         </el-form-item>
+        <el-form-item label="菜单备注" prop="notes">
+          <el-input
+            v-model="formData.notes"
+            clearable
+            placeholder="请输入菜单备注"
+          />
+        </el-form-item>
         <el-form-item label="菜单排序" prop="sort">
           <el-input
             v-model="formData.sort"
@@ -152,6 +159,7 @@ const formData = reactive({
   name: "",
   icon: "",
   sort: 0,
+  notes: "",
   paths: "",
   params: "",
   is_show: 1,
diff --git a/src/views/user_menu/index.vue b/src/views/user_menu/index.vue
index d8a54a5..75c1e35 100644
--- a/src/views/user_menu/index.vue
+++ b/src/views/user_menu/index.vue
@@ -76,6 +76,11 @@
               <img :src="row.icon" style="width: 50px; height: 40px" />
             </template>
           </el-table-column>
+          <el-table-column
+            label="菜单备注"
+            prop="notes"
+            show-overflow-tooltip
+          />
           <el-table-column label="菜单排序" prop="sort" show-overflow-tooltip />
           <el-table-column
             label="路由地址"
diff --git a/src/views/user_role/auth.vue b/src/views/user_role/auth.vue
index 1dd43bb..9cc20cd 100644
--- a/src/views/user_role/auth.vue
+++ b/src/views/user_role/auth.vue
@@ -27,7 +27,7 @@
                   ref="treeRef"
                   :data="menuTree"
                   :props="{
-                    label: 'name',
+                    label: 'nameAndNotes',
                     children: 'children',
                   }"
                   :check-strictly="!checkStrictly"
@@ -81,6 +81,18 @@ const rules = {
 const getOptions = () => {
   loading.value = true;
   apiUserMenuLists().then((res: any) => {
+    for (let p of res.lists) {
+      p.notes
+        ? (p["nameAndNotes"] = p.name + " (" + p.notes + ")")
+        : (p["nameAndNotes"] = p.name);
+      if (p.children) {
+        for (let i of p.children) {
+          i.notes
+            ? (i["nameAndNotes"] = i.name + " (" + i.notes + ")")
+            : (i["nameAndNotes"] = i.name);
+        }
+      }
+    }
     menuTree.value = res.lists;
     nextTick(() => {
       setDeptAllCheckedKeys();