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

6
Yi.RuoYi.Vue3/src/views/system/config/index.vue
View File

@@ -116,13 +116,13 @@
<el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
type="text"
link
icon="Edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:config:edit']"
>修改</el-button>
<el-button
type="text"
link
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:config:remove']"
@@ -156,7 +156,7 @@
<el-radio
v-for="dict in sys_yes_no"
:key="dict.value"
:label="dict.value"
:value="dict.value"
>{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>

8
Yi.RuoYi.Vue3/src/views/system/dept/index.vue
View File

@@ -69,20 +69,20 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
type="text"
link
icon="Edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:dept:edit']"
>修改</el-button>
<el-button
type="text"
link
icon="Plus"
@click="handleAdd(scope.row)"
v-hasPermi="['system:dept:add']"
>新增</el-button>
<el-button
v-if="scope.row.parentId != 0"
type="text"
link
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:dept:remove']"
@@ -138,7 +138,7 @@
<el-radio
v-for="dict in sys_normal_disable"
:key="dict.value"
:label="JSON.parse(dict.value)"
:value="JSON.parse(dict.value)"
>{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>

6
Yi.RuoYi.Vue3/src/views/system/dict/data.vue
View File

@@ -110,13 +110,13 @@
<el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
type="text"
link
icon="Edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:dict:edit']"
>修改</el-button>
<el-button
type="text"
link
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:dict:remove']"
@@ -163,7 +163,7 @@
</el-form-item>
<el-form-item label="状态" prop="state">
<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-form-item label="备注" prop="remark">

6
Yi.RuoYi.Vue3/src/views/system/dict/index.vue
View File

@@ -127,13 +127,13 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
type="text"
link
icon="Edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:dict:edit']"
>修改</el-button>
<el-button
type="text"
link
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:dict:remove']"
@@ -162,7 +162,7 @@
</el-form-item>
<el-form-item label="状态" prop="state">
<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-form-item label="备注" prop="remark">

24
Yi.RuoYi.Vue3/src/views/system/menu/index.vue
View File

@@ -77,19 +77,19 @@
<el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
type="text"
link
icon="Edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:menu:edit']"
>修改</el-button>
<el-button
type="text"
link
icon="Plus"
@click="handleAdd(scope.row)"
v-hasPermi="['system:menu:add']"
>新增</el-button>
<el-button
type="text"
link
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:menu:remove']"
@@ -117,9 +117,9 @@
<el-col :span="24">
<el-form-item label="菜单类型" prop="menuType">
<el-radio-group v-model="form.menuType">
<el-radio label="Catalogue">目录</el-radio>
<el-radio label="Menu">菜单</el-radio>
<el-radio label="Component">按钮</el-radio>
<el-radio value="Catalogue">目录</el-radio>
<el-radio value="Menu">菜单</el-radio>
<el-radio value="Component">按钮</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -169,8 +169,8 @@
</span>
</template>
<el-radio-group v-model="form.isLink">
<el-radio :label=true>是</el-radio>
<el-radio :label=false>否</el-radio>
<el-radio :value=true>是</el-radio>
<el-radio :value=false>否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -239,8 +239,8 @@
</span>
</template>
<el-radio-group v-model="form.isCache">
<el-radio :label=true>缓存</el-radio>
<el-radio :label=false>不缓存</el-radio>
<el-radio :value=true>缓存</el-radio>
<el-radio :value=false>不缓存</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -258,7 +258,7 @@
<el-radio
v-for="dict in sys_show_hide"
:key="dict.value"
:label="JSON.parse(dict.value)"
:value="JSON.parse(dict.value)"
>{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
@@ -274,7 +274,7 @@
</span>
</template>
<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>

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

@@ -86,7 +86,7 @@
<template #default="scope">
<el-button
type="text"
link
icon="Promotion"
@click="handleOnlineSend(scope.row.id)"
v-hasPermi="['system:notice:edit']"
@@ -94,7 +94,7 @@
<el-button
type="text"
link
icon="Promotion"
@click="handleOfflineSend(scope.row.id)"
v-hasPermi="['system:notice:edit']"
@@ -102,13 +102,13 @@
<el-button
type="text"
link
icon="Edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:notice:edit']"
>修改</el-button>
<el-button
type="text"
link
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:notice:remove']"
@@ -152,7 +152,7 @@
<el-radio
v-for="dict in sys_notice_state"
:key="dict.value"
:label="dict.value"
:value="dict.value"
>{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>

6
Yi.RuoYi.Vue3/src/views/system/post/index.vue
View File

@@ -94,13 +94,13 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
type="text"
link
icon="Edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:post:edit']"
>修改</el-button>
<el-button
type="text"
link
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:post:remove']"
@@ -131,7 +131,7 @@
</el-form-item>
<el-form-item label="岗位状态" prop="state">
<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-form-item label="备注" prop="remark">

2
Yi.RuoYi.Vue3/src/views/system/role/authUser.vue
View File

@@ -76,7 +76,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
type="text"
link
icon="CircleClose"
@click="cancelAuthUser(scope.row)"
v-hasPermi="['system:role:remove']"

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

@@ -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>

8
Yi.RuoYi.Vue3/src/views/system/tenant/index.vue
View File

@@ -102,11 +102,11 @@ system/tenant : api文件路径,例如：codeGen/tableApi
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button type="text" icon="Edit" @click="handleInit(scope.row.id)"
<el-button link icon="Edit" @click="handleInit(scope.row.id)"
v-hasPermi="['system:tenant:edit']">初始化</el-button>
<el-button type="text" icon="Edit" @click="handleUpdate(scope.row)"
<el-button link icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:tenant:edit']">修改</el-button>
<el-button type="text" icon="Delete" @click="handleDelete(scope.row)"
<el-button link icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:tenant:remove']">删除</el-button>
</template>
</el-table-column>
@@ -129,7 +129,7 @@ system/tenant : api文件路径,例如：codeGen/tableApi
<el-radio
v-for="dict in ['Sqlite','Mysql','Sqlserver']"
:key="dict"
:label="dict"
:value="dict"
>{{ dict }}</el-radio
>
</el-radio-group>

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>

4
Yi.RuoYi.Vue3/src/views/system/user/profile/userInfo.vue
View File

@@ -11,8 +11,8 @@
</el-form-item>
<el-form-item label="性别">
<el-radio-group v-model="user.sex">
<el-radio :label="0">男</el-radio>
<el-radio :label="1">女</el-radio>
<el-radio :value="0">男</el-radio>
<el-radio :value="1">女</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item>