FatttSnake/Pinnacle-OA
1
0
Fork 0
mirror of https://github.com/FatttSnake/Pinnacle-OA.git synced 2026-04-06 07:21:24 +08:00
Code Packages Releases Activity

Added enable status to Role, Group and User

Browse Source
This commit is contained in:
Fat Snake
2023-05-22 02:04:36 +08:00
parent b9dc1813ba
commit 9a7702efe6
14 changed files with 103 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ui/src/pages/power/GroupManagement.vue
View File

@@ -49,6 +49,16 @@
/>
</el-select>
</el-form-item>
<el-form-item label="状态">
<el-switch
v-model="groupForm.enable"
inline-prompt
active-text="启用"
:active-value="1"
inactive-text="禁用"
:inactive-value="0"
/>
</el-form-item>
</el-form>
</template>
<template #footer>
@@ -81,7 +91,8 @@ export default {
roles: [],
groupForm: {
inputGroupName: '',
selectedRoles: []
selectedRoles: [],
enable: 0
},
isAddNew: true,
dialogTitle: '',
@@ -130,6 +141,7 @@ export default {
if (this.isAddNew) {
this.groupForm.inputGroupName = ''
this.groupForm.selectedRoles = []
this.groupForm.enable = 0
this.dialogTitle = '添加用户组'
} else {
this.dialogTitle = '编辑用户组'
@@ -157,6 +169,7 @@ export default {
for (const role of row.roles) {
this.groupForm.selectedRoles.push(role.id)
}
this.groupForm.enable = row.enable
this.isAddNew = false
this.dialogVisible = true
},
@@ -193,7 +206,8 @@ export default {
const groupObject = {
id: '',
name: this.groupForm.inputGroupName,
roles: []
roles: [],
enable: this.groupForm.enable
}
for (const roleId of this.groupForm.selectedRoles) {
const role = {

18
ui/src/pages/power/RoleManagement.vue
View File

@@ -51,6 +51,16 @@
@check-change="handleSelectedPowerChange"
/>
</el-form-item>
<el-form-item label="状态">
<el-switch
v-model="roleForm.enable"
inline-prompt
active-text="启用"
:active-value="1"
inactive-text="禁用"
:inactive-value="0"
/>
</el-form-item>
</el-form>
</template>
<template #footer>
@@ -88,7 +98,8 @@ export default {
},
roleForm: {
inputRoleName: '',
selectedPower: new Set()
selectedPower: new Set(),
enable: 0
},
isAddNew: true,
defaultSelectedPower: [],
@@ -156,6 +167,7 @@ export default {
this.defaultSelectedPower = []
this.roleForm.inputRoleName = ''
this.roleForm.selectedPower.clear()
this.roleForm.enable = 0
this.dialogTitle = '添加角色'
} else {
this.dialogTitle = '编辑角色'
@@ -209,6 +221,7 @@ export default {
this.roleForm.inputRoleName = row.name
this.editRoleId = row.id
this.roleForm.selectedPower.clear()
this.roleForm.enable = row.enable
this.defaultSelectedPower = []
for (const operation of row.operations) {
this.defaultSelectedPower.push(operation.powerId)
@@ -256,7 +269,8 @@ export default {
const roleObject = {
id: '',
name: this.roleForm.inputRoleName,
powers: []
powers: [],
enable: this.roleForm.enable
}
for (const powerId of this.roleForm.selectedPower) {
const power = {

18
ui/src/pages/power/UserManagement.vue
View File

@@ -82,6 +82,16 @@
/>
</el-select>
</el-form-item>
<el-form-item label="状态">
<el-switch
v-model="userForm.enable"
inline-prompt
active-text="启用"
:active-value="1"
inactive-text="禁用"
:inactive-value="0"
/>
</el-form-item>
</el-form>
</template>
<template #footer>
@@ -124,7 +134,8 @@ export default {
inputUsername: '',
inputPassword: '',
selectedRoles: [],
selectedGroups: []
selectedGroups: [],
enable: 0
},
isAddNew: true,
dialogTitle: '',
@@ -230,6 +241,7 @@ export default {
this.userForm.selectedGroups.push(group.id)
}
}
this.userForm.enable = row.enable
this.isAddNew = false
this.dialogVisible = true
},
@@ -270,6 +282,7 @@ export default {
this.userForm.inputPassword = ''
this.userForm.selectedRoles = []
this.userForm.selectedGroups = []
this.userForm.enable = 0
this.dialogTitle = '添加用户'
} else {
this.dialogTitle = '编辑用户'
@@ -288,7 +301,8 @@ export default {
username: this.userForm.inputUsername,
passwd: this.userForm.inputPassword,
roles: [],
groups: []
groups: [],
enable: this.userForm.enable
}
if (this.editUserId !== '1') {
for (const roleId of this.userForm.selectedRoles) {