提交 d11d43db authored 作者: 王鹏飞's avatar 王鹏飞

chore: update

上级 dd00816e
...@@ -8,8 +8,7 @@ ...@@ -8,8 +8,7 @@
</el-form-item> </el-form-item>
<el-form-item label="类型" prop="types"> <el-form-item label="类型" prop="types">
<el-checkbox-group v-model="form.types"> <el-checkbox-group v-model="form.types">
<el-checkbox :label="1">菜单权限</el-checkbox> <el-checkbox v-for="item in permissionTypeList" :label="item.value" :key="item.value">{{ item.label }}权限</el-checkbox>
<el-checkbox :label="2">按钮权限</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item label="所属系统" prop="system_tags"> <el-form-item label="所属系统" prop="system_tags">
...@@ -27,11 +26,12 @@ ...@@ -27,11 +26,12 @@
<script> <script>
import { clonePermission } from '../api.js' import { clonePermission } from '../api.js'
import { systemList } from '@/utils/dictionary.js' import { systemList, permissionTypeList } from '@/utils/dictionary.js'
export default { export default {
data() { data() {
return { return {
systemList, systemList,
permissionTypeList,
form: { form: {
current_project_id: this.$store.state.activeProject.id, current_project_id: this.$store.state.activeProject.id,
select_project_id: '', select_project_id: '',
......
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
</el-form-item> </el-form-item>
<el-form-item label="类型" prop="type"> <el-form-item label="类型" prop="type">
<el-radio-group v-model="form.type" :disabled="isEdit"> <el-radio-group v-model="form.type" :disabled="isEdit">
<el-radio :label="1">菜单权限</el-radio> <el-radio v-for="item in permissionTypeList" :label="item.value" :key="item.value">{{ item.label }}权限</el-radio>
<el-radio :label="2">按钮权限</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="所属系统" prop="system_tag"> <el-form-item label="所属系统" prop="system_tag">
...@@ -36,7 +35,7 @@ ...@@ -36,7 +35,7 @@
// lodash // lodash
import { createPermission, updatePermission } from '../api.js' import { createPermission, updatePermission } from '../api.js'
import { pick } from 'lodash' import { pick } from 'lodash'
import { systemList } from '@/utils/dictionary.js' import { systemList, permissionTypeList } from '@/utils/dictionary.js'
export default { export default {
props: { props: {
isEdit: { type: Boolean, default: false }, isEdit: { type: Boolean, default: false },
...@@ -45,6 +44,7 @@ export default { ...@@ -45,6 +44,7 @@ export default {
data() { data() {
return { return {
systemList, systemList,
permissionTypeList,
form: { parent_id: '0', type: 1, name: '', tag: '', system_tag: '', desc: '', effect_uris: '' }, form: { parent_id: '0', type: 1, name: '', tag: '', system_tag: '', desc: '', effect_uris: '' },
rules: { rules: {
name: [{ required: true, message: '请输入权限名称', trigger: 'blur' }], name: [{ required: true, message: '请输入权限名称', trigger: 'blur' }],
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<el-button type="warning" @click="cloneVisible = true">复制权限</el-button> <el-button type="warning" @click="cloneVisible = true">复制权限</el-button>
</template> </template>
<el-tabs v-model="activeName" type="card" @tab-click="handleClick"> <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane :label="item.label" :name="item.value" v-for="(item, index) in typeList" :key="index"></el-tab-pane> <el-tab-pane :label="item.label" :name="item.value.toString()" v-for="(item, index) in typeList" :key="index"></el-tab-pane>
</el-tabs> </el-tabs>
<template v-slot:table-x="{ row }"> <template v-slot:table-x="{ row }">
<el-button type="text" @click="handleCreate(row)">创建子权限</el-button><br /> <el-button type="text" @click="handleCreate(row)">创建子权限</el-button><br />
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<script> <script>
// 接口 // 接口
import { getPermissionList, deletePermission } from '../api' import { getPermissionList, deletePermission } from '../api'
import { system, systemList } from '@/utils/dictionary.js' import { system, systemList, permissionTypeList } from '@/utils/dictionary.js'
export default { export default {
components: { components: {
...@@ -35,11 +35,7 @@ export default { ...@@ -35,11 +35,7 @@ export default {
isEdit: false, // 是否是编辑状态 isEdit: false, // 是否是编辑状态
editRaw: {}, // 编辑的数据 editRaw: {}, // 编辑的数据
activeName: '', activeName: '',
typeList: [ typeList: [{ value: '', label: '全部' }].concat(permissionTypeList),
{ value: '', label: '全部' },
{ value: '1', label: '菜单' },
{ value: '2', label: '按钮' }
],
cloneVisible: false cloneVisible: false
} }
}, },
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<el-dialog :title="title" :close-on-click-modal="false" v-bind="$attrs" v-on="$listeners" width="500px"> <el-dialog :title="title" :close-on-click-modal="false" v-bind="$attrs" v-on="$listeners" width="500px">
<el-form ref="form" :model="form" :rules="rules" label-position="top"> <el-form ref="form" :model="form" :rules="rules" label-position="top">
<el-form-item label="角色用途" prop="purpose"> <el-form-item label="角色用途" prop="purpose">
<el-radio-group v-model="form.purpose"> <el-radio-group v-model="form.purpose" :disabled="isEdit">
<el-radio v-for="item in roleTypeList" :label="item.value" :key="item.value"> <el-radio v-for="item in roleTypeList" :label="item.value" :key="item.value">
{{ item.label }} {{ item.label }}
</el-radio> </el-radio>
......
...@@ -24,8 +24,8 @@ export const systemList = json2Array(system) ...@@ -24,8 +24,8 @@ export const systemList = json2Array(system)
// 角色用途 // 角色用途
export const permissionType = { export const permissionType = {
1: '菜单', 1: '菜单',
2: '按钮' 2: '按钮',
// 3: '功能' 3: '功能'
} }
// 角色用途列表 // 角色用途列表
export const permissionTypeList = json2Array(roleType) export const permissionTypeList = json2Array(permissionType)
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论