Merge branch 'abp' into abp-dev
This commit is contained in:
@@ -63,19 +63,19 @@
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template #default="scope">
|
||||
<el-tooltip content="修改" placement="top" v-if="scope.row.roleId !== 1">
|
||||
<el-button type="text" icon="Edit" @click=" handleUpdate(scope.row)" v-hasPermi="['system:role:edit']">
|
||||
<el-button link icon="Edit" @click=" handleUpdate(scope.row)" v-hasPermi="['system:role:edit']">
|
||||
</el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip content="删除" placement="top" v-if="scope.row.roleId !== 1">
|
||||
<el-button type="text" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:role:remove']">
|
||||
<el-button link icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:role:remove']">
|
||||
</el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip content="数据权限" placement="top" v-if="scope.row.roleId !== 1">
|
||||
<el-button type="text" icon="CircleCheck" @click="handleDataScope(scope.row)"
|
||||
<el-button link icon="CircleCheck" @click="handleDataScope(scope.row)"
|
||||
v-hasPermi="['system:role:edit']"></el-button>
|
||||
</el-tooltip>
|
||||
<!-- <el-tooltip content="分配用户" placement="top" v-if="scope.row.roleId !== 1">
|
||||
<el-button type="text" icon="User" @click="handleAuthUser(scope.row)" v-hasPermi="['system:role:edit']">
|
||||
<el-button link icon="User" @click="handleAuthUser(scope.row)" v-hasPermi="['system:role:edit']">
|
||||
</el-button>
|
||||
</el-tooltip> -->
|
||||
</template>
|
||||
@@ -109,7 +109,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="状态">
|
||||
<el-radio-group v-model="form.state">
|
||||
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="JSON.parse(dict.value)">{{ dict.label
|
||||
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="JSON.parse(dict.value)">{{ dict.label
|
||||
}}</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
|
||||
Reference in New Issue
Block a user