权限模板功能调试
This commit is contained in:
parent
9704d0d055
commit
9b37f1a3fd
|
|
@ -10,7 +10,7 @@ export const addTemplateAPI = (data) => {
|
|||
* @data 修改权限模板参数 权限模板修改接口
|
||||
*/
|
||||
export const editTemplateAPI = (data) => {
|
||||
return request.get('/system/dept/edit', data)
|
||||
return request.post('/system/template/edit', data)
|
||||
}
|
||||
/**
|
||||
* @data 查询参数 权限模板列表接口
|
||||
|
|
@ -23,5 +23,11 @@ export const getTemplateListAPI = (data) => {
|
|||
* @ids 参数
|
||||
*/
|
||||
export const deleteTemplateAPI = (data) => {
|
||||
return request.post('/system/template/delete', data)
|
||||
return request.post('/system/template/delete/' + data)
|
||||
}
|
||||
/**
|
||||
* @data 删除参数 查询权限模板详情
|
||||
*/
|
||||
export const getTemplateMenuTreeselectAPI = (id) => {
|
||||
return request.get(`/system/template/templateMenuTreeselect/${id}`)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@
|
|||
:inline="true"
|
||||
v-show="showSearch"
|
||||
>
|
||||
<el-form-item label="模板名称" prop="roleName">
|
||||
<el-form-item label="模板名称" prop="name">
|
||||
<el-input
|
||||
v-model="queryParams.roleName"
|
||||
v-model="queryParams.name"
|
||||
placeholder="请输入模板名称"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
|
|
@ -45,26 +45,13 @@
|
|||
>新增
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
v-hasPermi="['system:role:edit']"
|
||||
>修改
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
@click="handleDelete(null, 0)"
|
||||
v-hasPermi="['system:role:remove']"
|
||||
>删除
|
||||
</el-button>
|
||||
|
|
@ -82,37 +69,27 @@
|
|||
@selection-change="handleSelectionChange"
|
||||
:selectable="checkSelectable"
|
||||
:row-class-name="getRowClassName"
|
||||
border
|
||||
>
|
||||
<el-table-column type="selection" min-width="55" align="center" />
|
||||
<el-table-column
|
||||
label="模板编号"
|
||||
prop="roleId"
|
||||
min-width="120"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
label="模板名称"
|
||||
align="center"
|
||||
prop="roleName"
|
||||
prop="name"
|
||||
:show-overflow-tooltip="true"
|
||||
min-width="150"
|
||||
/>
|
||||
|
||||
<el-table-column
|
||||
label="创建时间"
|
||||
label="备注"
|
||||
align="center"
|
||||
prop="createTime"
|
||||
min-width="180"
|
||||
prop="remark"
|
||||
width="180"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.createTime) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="操作"
|
||||
align="center"
|
||||
class-name="small-padding fixed-width"
|
||||
>
|
||||
<el-table-column label="操作" align="center" width="140">
|
||||
<template
|
||||
slot-scope="scope"
|
||||
v-if="scope.row.roleId !== 1 && scope.row.isBuiltIn !== '0'"
|
||||
|
|
@ -129,7 +106,7 @@
|
|||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
@click="handleDelete(scope.row, 1)"
|
||||
v-hasPermi="['system:role:remove']"
|
||||
>删除
|
||||
</el-button>
|
||||
|
|
@ -158,14 +135,14 @@
|
|||
:rules="rules"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-form-item label="模板名称" prop="roleName">
|
||||
<el-form-item label="模板名称" prop="name">
|
||||
<el-input
|
||||
v-model="form.roleName"
|
||||
placeholder="请输入角色名称"
|
||||
v-model="form.name"
|
||||
placeholder="请输入模板名称"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="菜单权限">
|
||||
<el-form-item label="菜单权限" prop="menuIds">
|
||||
<el-checkbox
|
||||
v-model="menuExpand"
|
||||
@change="handleCheckedTreeExpand($event, 'menu')"
|
||||
|
|
@ -219,6 +196,13 @@ import {
|
|||
changeRoleStatus,
|
||||
deptTreeSelect,
|
||||
} from '@/api/system/role'
|
||||
import {
|
||||
addTemplateAPI,
|
||||
getTemplateListAPI,
|
||||
getTemplateMenuTreeselectAPI,
|
||||
editTemplateAPI,
|
||||
deleteTemplateAPI,
|
||||
} from '@/api/permission-template/index.js'
|
||||
import {
|
||||
treeselect as menuTreeselect,
|
||||
roleMenuTreeselect,
|
||||
|
|
@ -298,24 +282,17 @@ export default {
|
|||
},
|
||||
// 表单校验
|
||||
rules: {
|
||||
roleName: [
|
||||
name: [
|
||||
{
|
||||
required: true,
|
||||
message: '角色名称不能为空',
|
||||
message: '模板名称不能为空',
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
roleKey: [
|
||||
menuIds: [
|
||||
{
|
||||
required: true,
|
||||
message: '权限字符不能为空',
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
roleSort: [
|
||||
{
|
||||
required: true,
|
||||
message: '角色顺序不能为空',
|
||||
message: '菜单权限不能为空',
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
|
|
@ -327,16 +304,21 @@ export default {
|
|||
},
|
||||
methods: {
|
||||
/** 查询角色列表 */
|
||||
getList() {
|
||||
async getList() {
|
||||
this.loading = true
|
||||
listRole(this.addDateRange(this.queryParams, this.dateRange)).then(
|
||||
(response) => {
|
||||
this.roleList = response.rows
|
||||
this.total = response.total
|
||||
// listRole(this.addDateRange(this.queryParams, this.dateRange)).then(
|
||||
// (response) => {
|
||||
// this.roleList = response.rows
|
||||
// this.total = response.total
|
||||
// this.loading = false
|
||||
// },
|
||||
// )
|
||||
|
||||
const res = await getTemplateListAPI()
|
||||
this.roleList = res.rows
|
||||
this.total = res.total
|
||||
this.loading = false
|
||||
},
|
||||
)
|
||||
},
|
||||
/** 查询菜单树结构 */
|
||||
getMenuTreeselect() {
|
||||
menuTreeselect().then((response) => {
|
||||
|
|
@ -362,8 +344,8 @@ export default {
|
|||
return checkedKeys
|
||||
},
|
||||
/** 根据角色ID查询菜单树结构 */
|
||||
getRoleMenuTreeselect(roleId) {
|
||||
return roleMenuTreeselect(roleId).then((response) => {
|
||||
getRoleMenuTreeselect(tempId) {
|
||||
return getTemplateMenuTreeselectAPI(tempId).then((response) => {
|
||||
this.menuOptions = response.menus
|
||||
return response
|
||||
})
|
||||
|
|
@ -410,15 +392,8 @@ export default {
|
|||
(this.deptExpand = true),
|
||||
(this.deptNodeAll = false),
|
||||
(this.form = {
|
||||
roleId: undefined,
|
||||
roleName: undefined,
|
||||
roleKey: undefined,
|
||||
roleSort: 0,
|
||||
status: '0',
|
||||
name: undefined,
|
||||
menuIds: [],
|
||||
deptIds: [],
|
||||
menuCheckStrictly: true,
|
||||
deptCheckStrictly: true,
|
||||
remark: undefined,
|
||||
})
|
||||
this.resetForm('form')
|
||||
|
|
@ -442,7 +417,7 @@ export default {
|
|||
)
|
||||
|
||||
// 更新选中的roleId数组
|
||||
this.ids = validSelection.map((item) => item.roleId)
|
||||
this.ids = validSelection.map((item) => item.id)
|
||||
// 更新单选和多选状态
|
||||
this.single = validSelection.length !== 1
|
||||
this.multiple = !validSelection.length
|
||||
|
|
@ -502,11 +477,12 @@ export default {
|
|||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset()
|
||||
const roleId = row.roleId || this.ids
|
||||
const roleMenu = this.getRoleMenuTreeselect(roleId)
|
||||
getRole(roleId).then((response) => {
|
||||
this.form = response.data
|
||||
this.title = '修改权限模板'
|
||||
this.open = true
|
||||
this.form.name = row.name
|
||||
this.form.remark = row.remark
|
||||
// const roleId = row.roleId || this.ids
|
||||
const roleMenu = this.getRoleMenuTreeselect(row.id)
|
||||
this.$nextTick(() => {
|
||||
roleMenu.then((res) => {
|
||||
let checkedKeys = res.checkedKeys
|
||||
|
|
@ -517,8 +493,6 @@ export default {
|
|||
})
|
||||
})
|
||||
})
|
||||
this.title = '修改角色'
|
||||
})
|
||||
},
|
||||
/** 选择角色权限范围触发 */
|
||||
dataScopeSelectChange(value) {
|
||||
|
|
@ -548,18 +522,18 @@ export default {
|
|||
},
|
||||
/** 提交按钮 */
|
||||
submitForm: function () {
|
||||
this.form.menuIds = this.getMenuAllCheckedKeys()
|
||||
this.$refs['form'].validate((valid) => {
|
||||
if (valid) {
|
||||
if (this.form.roleId != undefined) {
|
||||
this.form.menuIds = this.getMenuAllCheckedKeys()
|
||||
updateRole(this.form).then((response) => {
|
||||
if (this.title === '修改权限模板') {
|
||||
// this.form.menuIds = this.getMenuAllCheckedKeys()
|
||||
editTemplateAPI(this.form).then((response) => {
|
||||
this.$modal.msgSuccess('修改成功')
|
||||
this.open = false
|
||||
this.getList()
|
||||
})
|
||||
} else {
|
||||
this.form.menuIds = this.getMenuAllCheckedKeys()
|
||||
addRole(this.form).then((response) => {
|
||||
addTemplateAPI(this.form).then((response) => {
|
||||
this.$modal.msgSuccess('新增成功')
|
||||
this.open = false
|
||||
this.getList()
|
||||
|
|
@ -580,17 +554,20 @@ export default {
|
|||
}
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const roleIds = row.roleId || this.ids
|
||||
handleDelete(row, type) {
|
||||
if (!row && this.ids.length < 1) {
|
||||
this.$modal.msgError('请勾选需要删除的模板')
|
||||
return
|
||||
}
|
||||
const roleIds = type === 0 ? this.ids : row.id
|
||||
this.$modal
|
||||
.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?')
|
||||
.then(function () {
|
||||
return delRole(roleIds)
|
||||
})
|
||||
.then(() => {
|
||||
.confirm('是否确认删除权限模板?')
|
||||
.then(async () => {
|
||||
const res = await deleteTemplateAPI(roleIds)
|
||||
this.getList()
|
||||
this.$modal.msgSuccess('删除成功')
|
||||
})
|
||||
|
||||
.catch(() => {})
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
|
|
|
|||
Loading…
Reference in New Issue