From 59912db464a3676c54da87076cc5f40451c0603d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E8=8F=B2?= <1622041228@qq.com>
Date: Mon, 30 May 2022 13:35:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=BC=B9=E7=AA=97=E7=BB=84=E4=BB=B6=E5=8A=A0v-if?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Menu/index.vue          |  1 +
 .../system/dept/components/DeptModal.vue      |  1 +
 src/views/system/dept/index.vue               | 15 ++++++++--
 .../system/menu/components/MenuModal.vue      |  3 +-
 src/views/system/menu/index.vue               |  1 +
 src/views/system/role/index.vue               | 28 +++++++++++--------
 6 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/layout/components/Menu/index.vue b/src/layout/components/Menu/index.vue
index 5571a5d..aaa1812 100644
--- a/src/layout/components/Menu/index.vue
+++ b/src/layout/components/Menu/index.vue
@@ -1,6 +1,7 @@
 <template>
   <n-menu
     :mode="menuMode"
+    :accordion="true"
     :value="(currentRoute.title && currentRoute.meta.activeMenu) || currentRoute.title"
     :options="getMenuOptions"
     @update:value="handleMenuSelect"
diff --git a/src/views/system/dept/components/DeptModal.vue b/src/views/system/dept/components/DeptModal.vue
index 97f0b42..61c8bbb 100644
--- a/src/views/system/dept/components/DeptModal.vue
+++ b/src/views/system/dept/components/DeptModal.vue
@@ -126,6 +126,7 @@ export default defineComponent({
       if (props.row.pid === 0) {
         row.pid = null
       }
+      console.log('====部门计算属性触发了====', row)
       return {
         title: props.row.name ? '修改部门' : '添加部门',
         show: props.visible,
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 284278b..3ccdb7e 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -31,7 +31,11 @@
 import headSearch from '@/components/Search/index.vue'
 import dataTable from '@/components/DataTable/index.vue'
 import TableAction from '@/components/DataTable/tools/Action.vue'
-import { getDeptList, getDeptAll, deleteDept } from '@/api/system/dept/index.js'
+import {
+  getDeptList,
+  getDeptAll,
+  deleteDept
+} from '@/api/system/dept/index.js'
 import { h, unref, toRefs, ref, reactive, onMounted } from 'vue'
 import DeptModal from './components/DeptModal.vue'
 import info from './info.js'
@@ -166,7 +170,14 @@ export default {
         })
     }
 
-    return { ...toRefs(data), tableRef, loadDataTable, handleSearch, handleModal, deleteSingle }
+    return {
+      ...toRefs(data),
+      tableRef,
+      loadDataTable,
+      handleSearch,
+      handleModal,
+      deleteSingle
+    }
   }
 }
 </script>
diff --git a/src/views/system/menu/components/MenuModal.vue b/src/views/system/menu/components/MenuModal.vue
index a761abf..e62c0e9 100644
--- a/src/views/system/menu/components/MenuModal.vue
+++ b/src/views/system/menu/components/MenuModal.vue
@@ -175,9 +175,10 @@ export default defineComponent({
       if (props.data.pid === 0) {
         row.pid = null
       }
+      console.log('菜单页面计算属性触发：', row)
       return {
-        show: props.visible,
         title: props.data.title ? '修改菜单' : '添加菜单',
+        show: props.visible,
         form: Object.assign(data.form, row),
         negativeText: '取消',
         positiveText: '确认'
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 52d4941..6a79288 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -17,6 +17,7 @@
   </div>
 
   <MenuModal
+    v-if="modalShow"
     v-model:visible="modalShow"
     :data="rowData"
     :menu-list="menuList"
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 367b692..8337fb8 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -48,7 +48,11 @@ import headSearch from '@/components/Search/index.vue'
 import dataTable from '@/components/DataTable/index.vue'
 import TableAction from '@/components/DataTable/tools/Action.vue'
 import TableSwitch from '@/components/DataTable/tools/Switch.vue'
-import { getRoleList, deleteRole, setRoleStatus } from '@/api/system/role/index'
+import {
+  getRoleList,
+  deleteRole,
+  setRoleStatus
+} from '@/api/system/role/index'
 import { h, ref, unref, toRefs, reactive } from 'vue'
 import table from './table.js'
 import info from './info.js'
@@ -198,16 +202,18 @@ export default {
     // 设置状态
     function setStatus(row) {
       console.log(row)
-      setRoleStatus({ id: row.data.id, status: row.value }).then(res => {
-        if (res.code === 0) {
-          handleSearch()
-          $message.success(res.msg)
-        } else {
-          $message.error(res.msg)
-        }
-      }).catch(e => {
-        console.log(e)
-      })
+      setRoleStatus({ id: row.data.id, status: row.value })
+        .then((res) => {
+          if (res.code === 0) {
+            handleSearch()
+            $message.success(res.msg)
+          } else {
+            $message.error(res.msg)
+          }
+        })
+        .catch((e) => {
+          console.log(e)
+        })
     }
 
     return {