From 389add2a8ad66eec4fb0f32cda3dd8b547bbf067 Mon Sep 17 00:00:00 2001
From: china_ahhui <ahhuiguys@163.com>
Date: Sun, 2 Jun 2024 12:25:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A7=92=E8=89=B2=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=93=8D=E4=BD=9C=E7=95=8C=E9=9D=A2=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E6=9F=90=E4=B8=AA=E9=9B=86=E6=97=B6=E4=BC=9A=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E4=B8=A4=E5=9D=97=E7=9B=B8=E4=BC=BC=E5=86=85=E5=AE=B9=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/role/components/PermissionComNew/index.vue | 11 +++++------
 .../system/role/components/PermissionComNew/types.ts  |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/web/src/views/system/role/components/PermissionComNew/index.vue b/web/src/views/system/role/components/PermissionComNew/index.vue
index a76a154..23aa021 100644
--- a/web/src/views/system/role/components/PermissionComNew/index.vue
+++ b/web/src/views/system/role/components/PermissionComNew/index.vue
@@ -6,7 +6,7 @@
     <template #header>
       <el-row>
         <el-col :span="4">
-          <div>当前授权角色:
+          <div>当前授权角色：
             <el-tag>{{ props.roleName }}</el-tag>
           </div>
         </el-col>
@@ -20,8 +20,7 @@
     </template>
     <div class="permission-com">
       <el-collapse v-model="collapseCurrent" @change="handleCollapseChange" accordion>
-        <el-collapse-item v-for="(item,mIndex) in menuData" :key="mIndex" :name="mIndex"
-                          style="    background-color: #fafafa;">
+        <el-collapse-item v-for="(item,mIndex) in menuData" :key="mIndex" :name="mIndex" style="background-color: #fafafa;">
           <template #title>
             <div>
               <div class="pc-collapse-title">
@@ -159,7 +158,7 @@ const defaultTreeProps = {
 };
 
 let menuData = ref<MenuDataType[]>([]);
-let collapseCurrent = ref(['1']);
+let collapseCurrent = ref<number[]>([]);
 let menuCurrent = ref<Partial<MenuDataType>>({});
 let menuBtnCurrent = ref<number>(-1);
 let dialogVisible = ref(false);
@@ -190,7 +189,7 @@ const fetchData = async () => {
   }
 };
 
-const handleCollapseChange = (val: string) => {
+const handleCollapseChange = (val: number) => {
   collapseCurrent.value = [val];
 };
 
@@ -252,7 +251,7 @@ const handleDialogClose = () => {
 
 //保存权限
 const handleSavePermission = () => {
-  setRolePremission(props.roleId, menuData.value).then(res => {
+  setRolePremission(props.roleId, menuData.value).then((res: any) => {
     ElMessage({
       message: res.msg,
       type: 'success',
diff --git a/web/src/views/system/role/components/PermissionComNew/types.ts b/web/src/views/system/role/components/PermissionComNew/types.ts
index c336389..39dbc5c 100644
--- a/web/src/views/system/role/components/PermissionComNew/types.ts
+++ b/web/src/views/system/role/components/PermissionComNew/types.ts
@@ -24,6 +24,6 @@ export interface MenuDataType {
   name: string;
   isCheck: boolean;
   radio: string;
-  btns: { id:number,label: string; value: string; isCheck: boolean; data_range: number;dept:object }[];
+  btns: { id:number,label: string; value: string; isCheck: boolean; data_range: number; dept:object; name:string }[];
   columns: { [key: string]: boolean | string; }[]
 }