diff --git a/src/views/system/user/list.user.vue b/src/views/system/user/list.user.vue
index ce1866c..5581d97 100644
--- a/src/views/system/user/list.user.vue
+++ b/src/views/system/user/list.user.vue
@@ -1,7 +1,7 @@
@@ -230,8 +218,10 @@
组织机构
-
+
@@ -243,12 +233,16 @@
-
+
-
+
@@ -265,8 +259,10 @@
重置密码
-
+
角色分配
@@ -280,8 +276,10 @@
-->
-
+
@@ -297,15 +295,15 @@
-
+
{{ scope.row.statusName }}
-
- {{ (btnNames as any)[scope.row.statusName] }}
+
+ {{ btnNames[scope.row.statusName] }}
@@ -334,34 +332,26 @@
display: none;
}
- .table-title {
- background-color: #409eff;
+ // .table-title {
+ // background-color: #409eff;
- .title {
- padding: 5px 10px;
- // background-color: ;
- font-size: 15px;
- line-height: 46px;
- color: #fff;
- display: flex;
- align-items: center;
+ // .title {
+ // padding: 5px 10px;
+ // // background-color: ;
+ // font-size: 15px;
+ // line-height: 46px;
+ // color: #fff;
+ // display: flex;
+ // align-items: center;
- .text {
- margin-left: 10px;
- }
- }
- }
+ // .text {
+ // margin-left: 10px;
+ // }
+ // }
+ // }
.table {
width: 78%;
-
- .pagination {
- margin-top: 10px;
- width: 100%;
- display: flex;
- flex-direction: column;
- align-items: center;
- }
}
}
@@ -372,14 +362,5 @@
height: 100vh;
background-color: #fff;
}
-
- .box-card {
- width: 100%;
-
- .user-dept-scroll {
- width: 100%;
- height: calc(100vh - 265px);
- }
- }
}
diff --git a/src/views/system/user/list.user.vue b/src/views/system/user/list.user.vue
index ce1866c..5581d97 100644
--- a/src/views/system/user/list.user.vue
+++ b/src/views/system/user/list.user.vue
@@ -1,7 +1,7 @@
@@ -230,8 +218,10 @@
组织机构
-
+
@@ -243,12 +233,16 @@
-
+
-
+
@@ -265,8 +259,10 @@
重置密码
-
+
角色分配
@@ -280,8 +276,10 @@
-->
-
+
@@ -297,15 +295,15 @@
-
+
{{ scope.row.statusName }}
-
- {{ (btnNames as any)[scope.row.statusName] }}
+
+ {{ btnNames[scope.row.statusName] }}
@@ -334,34 +332,26 @@
display: none;
}
- .table-title {
- background-color: #409eff;
+ // .table-title {
+ // background-color: #409eff;
- .title {
- padding: 5px 10px;
- // background-color: ;
- font-size: 15px;
- line-height: 46px;
- color: #fff;
- display: flex;
- align-items: center;
+ // .title {
+ // padding: 5px 10px;
+ // // background-color: ;
+ // font-size: 15px;
+ // line-height: 46px;
+ // color: #fff;
+ // display: flex;
+ // align-items: center;
- .text {
- margin-left: 10px;
- }
- }
- }
+ // .text {
+ // margin-left: 10px;
+ // }
+ // }
+ // }
.table {
width: 78%;
-
- .pagination {
- margin-top: 10px;
- width: 100%;
- display: flex;
- flex-direction: column;
- align-items: center;
- }
}
}
@@ -372,14 +362,5 @@
height: 100vh;
background-color: #fff;
}
-
- .box-card {
- width: 100%;
-
- .user-dept-scroll {
- width: 100%;
- height: calc(100vh - 265px);
- }
- }
}
diff --git a/src/views/system/user/role.assignment.vue b/src/views/system/user/role.assignment.vue
index 52b9073..40a325b 100644
--- a/src/views/system/user/role.assignment.vue
+++ b/src/views/system/user/role.assignment.vue
@@ -1,8 +1,8 @@
@@ -230,8 +218,10 @@
组织机构
-
+
@@ -243,12 +233,16 @@
-
+
-
+
@@ -265,8 +259,10 @@
重置密码
-
+
角色分配
@@ -280,8 +276,10 @@
-->
-
+
@@ -297,15 +295,15 @@
-
+
{{ scope.row.statusName }}
-
- {{ (btnNames as any)[scope.row.statusName] }}
+
+ {{ btnNames[scope.row.statusName] }}
@@ -334,34 +332,26 @@
display: none;
}
- .table-title {
- background-color: #409eff;
+ // .table-title {
+ // background-color: #409eff;
- .title {
- padding: 5px 10px;
- // background-color: ;
- font-size: 15px;
- line-height: 46px;
- color: #fff;
- display: flex;
- align-items: center;
+ // .title {
+ // padding: 5px 10px;
+ // // background-color: ;
+ // font-size: 15px;
+ // line-height: 46px;
+ // color: #fff;
+ // display: flex;
+ // align-items: center;
- .text {
- margin-left: 10px;
- }
- }
- }
+ // .text {
+ // margin-left: 10px;
+ // }
+ // }
+ // }
.table {
width: 78%;
-
- .pagination {
- margin-top: 10px;
- width: 100%;
- display: flex;
- flex-direction: column;
- align-items: center;
- }
}
}
@@ -372,14 +362,5 @@
height: 100vh;
background-color: #fff;
}
-
- .box-card {
- width: 100%;
-
- .user-dept-scroll {
- width: 100%;
- height: calc(100vh - 265px);
- }
- }
}
diff --git a/src/views/system/user/role.assignment.vue b/src/views/system/user/role.assignment.vue
index 52b9073..40a325b 100644
--- a/src/views/system/user/role.assignment.vue
+++ b/src/views/system/user/role.assignment.vue
@@ -1,8 +1,8 @@