修改菜单权限

杨泽宇
1 parent 668ef9f8
Showing 10 changed files with 79 additions and 81 deletions
src/layout/menu.vue
src/pinia/modules/login.ts
src/views/permission/index.vue
src/views/property/index.vue
src/views/role/index.vue
src/views/role/permission.vue
src/views/role/user.vue
src/views/user/edit.vue
src/views/user/index.vue
src/views/user/login.vue
@@ -49,71 +49,14 @@ onMounted(() =&gt; {
       >
         <template #title>
           <el-icon><location /></el-icon>
-          <span>{{ item.name }}假菜单</span>
+          <span>{{ item.name }}</span>
         </template>
         <el-menu-item-group v-for="(ele, i) in item.menuList" :key="i">
-          <el-menu-item :index="ele.path ? ele.path : '/'">{{
+          <el-menu-item :index="ele.url ? ele.url : '/'">{{
             ele.name
           }}</el-menu-item>
         </el-menu-item-group>
       </el-sub-menu>
-
-      <el-sub-menu index="11">
-        <template #title>
-          <el-icon><location /></el-icon>
-          <span>物业管理真菜单可点</span>
-        </template>
-        <el-menu-item-group>
-          <el-menu-item index="/property">物业列表</el-menu-item>
-        </el-menu-item-group>
-      </el-sub-menu>
-      <el-sub-menu index="12">
-        <template #title>
-          <el-icon><location /></el-icon>
-          <span>小区管理真菜单可点</span>
-        </template>
-        <el-menu-item-group>
-          <el-menu-item index="/community">小区管理</el-menu-item>
-          <el-menu-item index="/housekeeper">楼宇管理</el-menu-item>
-          <el-menu-item index="/houses">房屋管理</el-menu-item>
-        </el-menu-item-group>
-      </el-sub-menu>
-      <el-sub-menu index="13">
-        <template #title>
-          <el-icon><location /></el-icon>
-          <span>用户管理真菜单可点</span>
-        </template>
-        <el-menu-item-group>
-          <el-menu-item index="/user">用户列表</el-menu-item>
-        </el-menu-item-group>
-      </el-sub-menu>
-      <el-sub-menu index="14">
-        <template #title>
-          <el-icon><location /></el-icon>
-          <span>角色管理真菜单可点</span>
-        </template>
-        <el-menu-item-group>
-          <el-menu-item index="/role">角色列表</el-menu-item>
-        </el-menu-item-group>
-      </el-sub-menu>
-      <el-sub-menu index="15">
-        <template #title>
-          <el-icon><location /></el-icon>
-          <span>权限管理真菜单可点</span>
-        </template>
-        <el-menu-item-group>
-          <el-menu-item index="/permission">权限列表</el-menu-item>
-        </el-menu-item-group>
-      </el-sub-menu>
-      <el-sub-menu index="16">
-        <template #title>
-          <el-icon><location /></el-icon>
-          <span>系统管理真菜单可点</span>
-        </template>
-        <el-menu-item-group>
-          <el-menu-item index="/system">基本信息</el-menu-item>
-        </el-menu-item-group>
-      </el-sub-menu>
     </el-menu>
   </el-scrollbar>
 </template>
@@ -4,27 +4,49 @@ interface LoginUser {
   token: string,
   organizationId: number,
   id: number,
-  userName: string
+  userName: string,
+  organizationType: number | null,
+  organizationName: string,
+  organizationLogo: string
 }
 const id: string = 'login'
 const state: Function = () => ({
   token: '',
   organizationId: null,
   id: null,
-  userName: ''
+  userName: '',
+  organizationType: null,
+  organizationName: '',
+  organizationLogo: ''
 })
 const getters = {
   getToken() {
+    // 记录登录状态的标识
     return this.token
   },
   getOid() {
+    // 当前登录人的组织id
     return this.organizationId
   },
   getId() {
+    // 当前登录人的id
     return this.id
   },
   getUserName() {
+    // 当前登录人的用户名
     return this.userName
+  },
+  getOtype () {
+    // 1 物业管理员，2 公益管理员
+    return this.organizationType
+  },
+  getOname () {
+    // 当前登录的组织名称
+    return this.organizationName
+  },
+  getOlogo () {
+    // 当前登陆的组织logo
+    return this.organizationLogo
   }
 }
 const actions = {
@@ -33,9 +55,13 @@ const actions = {
     this.organizationId = obj.organizationId
     this.id = obj.id
     this.userName = obj.userName
+    this.organizationName = obj.organizationName
+    this.organizationType = obj.organizationType
+    this.organizationLogo = obj.organizationLogo
   },
   removeToken(msg: string | null) {
     this.token = ''
+    window.localStorage.removeItem('store-data')
     ElMessage.success(msg || '已退出登录');
     setTimeout(() => {
       router.replace('/login')
@@ -16,7 +16,7 @@ const getList = async () =&gt; {
   data.loading = true;
   try {
     const res = await permissionList();
-    data.list = res.data.data;
+    data.list = res?.data?.data;
   } catch (e) {
     console.log(e);
   } finally {
@@ -42,8 +42,8 @@ const getList = async () =&gt; {
   data.loading = true;
   try {
     const res = await propertyList(data.params.query);
-    data.list = res.data.data.list;
-    data.params.total = res.data.data.total;
+    data.list = res?.data?.data?.list;
+    data.params.total = res?.data?.data?.total;
   } catch (e) {
     console.log(e);
   } finally {
@@ -182,8 +182,18 @@ onMounted(() =&gt; {
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center">
+        <!-- 超级管理员、商务管理员、物业管理员、公益管理员这四个角色是系统角色，不可以编辑、删除。通过code字段判断 -->
         <template #default="scope">
-          <el-button type="text"
+          <el-button
+            type="text"
+            v-show="
+              ![
+                'SUPER_ADMIN',
+                'BUSINESS_ADMIN',
+                'PROPERTY_ADMIN',
+                'PUBLIC_BENEFIT_ADMIN',
+              ].includes(scope.row.code)
+            "
             ><router-link :to="{ path: '/role/edit', query: scope.row }"
               >编辑</router-link
             ></el-button
@@ -206,7 +216,17 @@ onMounted(() =&gt; {
               >权限</router-link
             ></el-button
           >
-          <el-button type="text" @click="handleDelete(scope.row)"
+          <el-button
+            type="text"
+            @click="handleDelete(scope.row)"
+            v-show="
+              ![
+                'SUPER_ADMIN',
+                'BUSINESS_ADMIN',
+                'PROPERTY_ADMIN',
+                'PUBLIC_BENEFIT_ADMIN',
+              ].includes(scope.row.code)
+            "
             >删除</el-button
           >
         </template>
@@ -60,8 +60,8 @@ const submitForm = (formEl: InstanceType&lt;typeof ElForm&gt; | undefined) =&gt; {
 const getPermissions = async (roleId = useRoute().query.roleId) => {
   try {
     let res = await rolePermission({ roleId: roleId });
-    form.permissions = res.data.data;
-    form.defaultPermissions = getCheckedPermissions(res.data.data)
+    form.permissions = res?.data?.data;
+    form.defaultPermissions = getCheckedPermissions(res?.data?.data)
   } catch (e) {
     console.log(e);
   }
@@ -43,8 +43,8 @@ const getList = async () =&gt; {
   data.loading = true;
   try {
     const res = await roleUser(data.params.query);
-    data.list = res.data.data.list;
-    data.params.total = res.data.data.total;
+    data.list = res?.data?.data?.list;
+    data.params.total = res?.data?.data?.total;
   } catch (e) {
     console.log(e);
   } finally {
@@ -5,6 +5,7 @@ import { roleList } from &quot;@/api/user/role&quot;;
 import { getTableList } from "@/api/community/residence";
 import { useRoute } from "vue-router";
 import { validMobile } from "@/utils/validate";
+import * as store from '@/pinia';
 import type { ElForm } from "element-plus";
 const {
   appContext: {
@@ -26,6 +27,9 @@ let form = reactive({
   checkList: [],
   communityList: [],
 });
+let asyncData = reactive({
+  userInfo: null
+})
 const ruleFormRef = ref<InstanceType<typeof ElForm>>();
 /**
  * 校验手机号格式
@@ -129,9 +133,9 @@ const getRoleList = async (pageSize: number = 20) =&gt; {
       page: 1,
       pageSize: pageSize,
     });
-    form.roles = res.data.data.list;
-    if (res.data.data.total > pageSize) {
-      getRoleList(res.data.data.total);
+    form.roles = res?.data?.data?.list;
+    if (res?.data?.data?.total > pageSize) {
+      getRoleList(res?.data?.data?.total);
     }
   } catch (e) {
     console.log(e);
@@ -148,15 +152,17 @@ const getCommunityList = async (pageSize: number = 20) =&gt; {
       type: 0,
       pageSize: pageSize,
     });
-    form.communities = res.data.data.list;
-    if (res.data.data.total > pageSize) {
-      getCommunityList(res.data.data.total);
+    form.communities = res?.data?.data?.list;
+    if (res?.data?.data?.total > pageSize) {
+      getCommunityList(res?.data?.data?.total);
     }
   } catch (e) {
     console.log(e);
   }
 };
 onMounted(() => {
+  asyncData.userInfo = store.family.loginStore().id
+  asyncData.userType = store.family.loginStore().organizationType
   getRoleList();
   getCommunityList();
   form.data = useRoute().query;
@@ -218,11 +224,13 @@ onMounted(() =&gt; {
               v-for="(item, index) in form.roles"
               :key="index"
               :label="item.id"
+              :disabled="asyncData.userInfo === 1 && item.code !== 'BUSINESS_ADMIN'"
               >{{ item.roleName }}</el-checkbox
             >
           </el-checkbox-group>
         </el-form-item>
-        <el-form-item label="小区" style="width: 100%">
+        <!-- 当前登录的用户是物业管理员，表单里才有关联小区 -->
+        <el-form-item label="小区" style="width: 100%" v-show="asyncData.userType === '1'">
           <el-checkbox-group
             v-model="form.communityList"
             @change="(data) => (form.data.neighborhoodIds = data.join(','))"
@@ -39,8 +39,8 @@ const getList = async () =&gt; {
   data.loading = true;
   try {
     const res = await userList(data.params.query);
-    data.list = res.data.data.list;
-    data.params.total = res.data.data.total;
+    data.list = res?.data?.data?.list;
+    data.params.total = res?.data?.data?.total;
   } catch (e) {
     console.log(e);
   } finally {
@@ -36,7 +36,8 @@ const submitForm = (formEl: InstanceType&lt;typeof ElForm&gt; | undefined) =&gt; {
       login(loginForm).then((res) => {
         if (res?.data) {
           globalProperties.$message.success("登录成功");
-          store.family.loginStore().setUserInfo(res.data.data);
+          // 登录成功返回的参数含义，到pinia/modules/login.ts中查看
+          store.family.loginStore().setUserInfo(res?.data?.data);
           getMenu().then((res) => {
             setTimeout(() => {
               router.push({ path: "/" });
@@ -55,7 +56,7 @@ const submitForm = (formEl: InstanceType&lt;typeof ElForm&gt; | undefined) =&gt; {
 const getMenu = async () => {
   try {
     let res = await menuData();
-    store.family.menuStore().setMenuList(res.data.data);
+    store.family.menuStore().setMenuList(res?.data?.data);
   } catch (e) {
     console.log(e);
   }