From 69505f82b44840d8719a05d0ff7d5f6f01e1ebcf Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 29 六月 2022 09:22:03 +0800
Subject: [PATCH] '系统'

---
 src/stores/userInfo.ts                               |    1 +
 src/layout/navBars/breadcrumb/user.vue               |    2 +-
 src/views/system/department/component/deptDialog.vue |    1 +
 src/views/system/department/index.vue                |    6 ------
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue
index 6782651..ca35a27 100644
--- a/src/layout/navBars/breadcrumb/user.vue
+++ b/src/layout/navBars/breadcrumb/user.vue
@@ -56,7 +56,7 @@
 		<el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
 			<span class="layout-navbars-breadcrumb-user-link">
 				<img :src="userInfos.photo" class="layout-navbars-breadcrumb-user-link-photo mr5" />
-				{{ userInfos.userName === '' ? 'common' : userInfos.userName }}
+				{{ userInfos.userName }}
 				<el-icon class="el-icon--right">
 					<ele-ArrowDown />
 				</el-icon>
diff --git a/src/stores/userInfo.ts b/src/stores/userInfo.ts
index f04e50b..1408dfa 100644
--- a/src/stores/userInfo.ts
+++ b/src/stores/userInfo.ts
@@ -21,6 +21,7 @@
 	}),
 	actions: {
 		async setUserInfos(value: any) {
+			debugger
 			this.userInfos.userName = value.username
 			this.userInfos.uid = value.id
 			this.userInfos.roles = value.role
diff --git a/src/views/system/department/component/deptDialog.vue b/src/views/system/department/component/deptDialog.vue
index 0477317..2006116 100644
--- a/src/views/system/department/component/deptDialog.vue
+++ b/src/views/system/department/component/deptDialog.vue
@@ -91,6 +91,7 @@
 				}
 			}else{
 				state.title = '编辑部门'
+				state.departmentForm = value
 			}
 		};
 		// 关闭弹窗
diff --git a/src/views/system/department/index.vue b/src/views/system/department/index.vue
index 4f33400..e5e0505 100644
--- a/src/views/system/department/index.vue
+++ b/src/views/system/department/index.vue
@@ -24,12 +24,6 @@
 				:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
 			>
 				<el-table-column prop="name" label="部门名称" show-overflow-tooltip> </el-table-column>
-				<el-table-column prop="status" label="部门状态" show-overflow-tooltip>
-					<template #default="scope">
-						<el-tag type="success" v-if="scope.row.status">启用</el-tag>
-						<el-tag type="info" v-else>禁用</el-tag>
-					</template>
-				</el-table-column>
 				<el-table-column prop="info" label="部门描述" show-overflow-tooltip></el-table-column>
 				<el-table-column label="操作" show-overflow-tooltip width="140">
 					<template #default="scope">

--
Gitblit v1.9.2