debug user list actions

杨泽宇
1 parent d03205eb
Showing 4 changed files with 54 additions and 13 deletions
src/api/user/login/index.ts
src/pinia/modules/login.ts
src/views/role/index.vue
src/views/user/index.vue
@@ -14,6 +14,18 @@ export const login = async ( data: any ) =&gt; {
 }
  
 /**
+ * @description 登出
+ * @function logout
+ */
+export const logout = async () => {
+  let res: any = await request({
+    url: '/logout',
+    method: 'get'
+  })
+  return res
+}
+
+/**
  * @description 权限菜单
  * @function menuData
  */
-import router from '@/router'
+import router from '@/router';
+import { logout } from '@/api/user/login';
 import { ElMessage } from "element-plus";
 interface LoginUser {
   token: string,
@@ -60,6 +61,7 @@ const actions = {
     this.organizationLogo = obj.organizationLogo
   },
   removeToken(msg: string | null) {
+    logout()
     this.token = ''
     window.localStorage.removeItem('store-data')
     ElMessage.success(msg || '已退出登录');
@@ -47,8 +47,8 @@ const getList = async () =&gt; {
   data.loading = true;
   try {
     const res = await roleList(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 {
@@ -35,6 +35,7 @@ let data = reactive({
 });
 let asyncData = reactive({
   userInfo: null,
+  userType: null,
 });
 /**
  * 列表
@@ -147,6 +148,7 @@ enum statusEnum {
 }
 onMounted(() => {
   asyncData.userInfo = store.family.loginStore().id;
+  asyncData.userType = store.family.loginStore().organizationType;
   getList();
 });
 </script>
@@ -210,10 +212,8 @@ onMounted(() =&gt; {
       </el-table-column>
       <el-table-column label="操作" align="center">
         <template #default="scope">
-          <!-- 超管可以做全部操作 -->
-          <template v-if="!['SUPER_ADMIN'].includes(
-                scope.row.roleList.map((i) => i.code).join(',')
-              )">
+          <template v-if="~~asyncData.userInfo === 1">
+            <!-- 超管可以做所有操作 -->
             <el-button type="text"
               ><router-link :to="{ path: '/user/edit', query: scope.row }"
                 >编辑</router-link
@@ -235,18 +235,45 @@ onMounted(() =&gt; {
               >删除</el-button
             >
           </template>
-          <!-- 物业管理员（机构管理员）、商务管理员只可以改密码 -->
-          <!-- 其他角色用户不可以做任何操作 以上均通过角色的code判断 -->
           <template
-            v-if="
-              !['PROPERTY_ADMIN', 'BUSINESS_ADMIN'].includes(
-                scope.row.roleList.map((i) => i.code).join(',')
-              )
+            v-else-if="
+              [
+                'PROPERTY_ADMIN',
+                'BUSINESS_ADMIN',
+                'PUBLIC_BENEFIT_ADMIN',
+              ].includes(scope.row.roleList.map((i) => i.code).join(','))
             "
           >
+            <!-- 商务管理员 物业管理员 公益管理员 -->
+            <template v-if="~~scope.row.id === ~~asyncData.userInfo">
+              <!-- 当前登录的人是三种管理员只能初始自己的密码， -->
+              <el-button type="text" @click="handleUpdate(scope.row, 'pwd')"
+                >初始密码</el-button
+              >
+            </template>
+          </template>
+          <template v-else>
+            <!-- 不是超管，不是三种管理员，随意操作 -->
+            <el-button type="text"
+              ><router-link :to="{ path: '/user/edit', query: scope.row }"
+                >编辑</router-link
+              ></el-button
+            >
+            <el-button type="text" @click="handleUpdate(scope.row, 'status')">{{
+              scope.row.status ? "禁用" : "启用"
+            }}</el-button>
             <el-button type="text" @click="handleUpdate(scope.row, 'pwd')"
               >初始密码</el-button
             >
+            <el-button type="text"
+              ><router-link
+                :to="{ path: '/user/role', query: { id: scope.row.id } }"
+                >角色</router-link
+              ></el-button
+            >
+            <el-button type="text" @click="handleDelete(scope.row)"
+              >删除</el-button
+            >
           </template>
         </template>
       </el-table-column>