xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'abp' into abp-dev

Browse Source
This commit is contained in:
陈淳
2024-04-15 08:50:06 +08:00
committed by tyjctl
parent 646531393f 9ef959ee46
commit cb7f4db207
37 changed files with 118 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Yi.RuoYi.Vue3/src/views/system/user/index.vue
View File

@@ -89,19 +89,19 @@
<el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top" v-if="scope.row.userName != 'cc'">
<el-button type="text" icon="Edit" @click="handleUpdate(scope.row)"
<el-button link icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:user:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top" v-if="scope.row.userName != 'cc'">
<el-button type="text" icon="Delete" @click="handleDelete(scope.row)"
<el-button link icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:user:remove']"></el-button>
</el-tooltip>
<el-tooltip content="重置密码" placement="top" v-if="scope.row.userName != 'cc'">
<el-button type="text" icon="Key" @click="handleResetPwd(scope.row)"
<el-button link icon="Key" @click="handleResetPwd(scope.row)"
v-hasPermi="['system:user:resetPwd']"></el-button>
</el-tooltip>
<!-- <el-tooltip content="分配角色" placement="top" v-if="scope.row.userName != 'cc'">
<el-button type="text" icon="CircleCheck" @click="handleAuthRole(scope.row)"
<el-button link icon="CircleCheck" @click="handleAuthRole(scope.row)"
v-hasPermi="['system:user:edit']"></el-button>
</el-tooltip> -->
</template>
@@ -165,7 +165,7 @@
<el-col :span="12">
<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>
<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>
</el-col>