Commit 12ab8b03 authored by RuoYi's avatar RuoYi
Browse files

使用vue-data-dict,简化数据字典使用

parent 23270c60
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
style="width: 240px" style="width: 240px"
> >
<el-option <el-option
v-for="dict in statusOptions" v-for="dict in dict.type.sys_normal_disable"
:key="dict.dictValue" :key="dict.value"
:label="dict.dictLabel" :label="dict.label"
:value="dict.dictValue" :value="dict.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="statusOptions" :value="scope.row.status"/> <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" /> <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
...@@ -174,10 +174,10 @@ ...@@ -174,10 +174,10 @@
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio <el-radio
v-for="dict in statusOptions" v-for="dict in dict.type.sys_normal_disable"
:key="dict.dictValue" :key="dict.value"
:label="dict.dictValue" :label="dict.value"
>{{dict.dictLabel}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
...@@ -197,6 +197,7 @@ import { listType, getType, delType, addType, updateType, exportType, refreshCac ...@@ -197,6 +197,7 @@ import { listType, getType, delType, addType, updateType, exportType, refreshCac
export default { export default {
name: "Dict", name: "Dict",
dicts: ['sys_normal_disable'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -219,8 +220,6 @@ export default { ...@@ -219,8 +220,6 @@ export default {
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 状态数据字典
statusOptions: [],
// 日期范围 // 日期范围
dateRange: [], dateRange: [],
// 查询参数 // 查询参数
...@@ -246,9 +245,6 @@ export default { ...@@ -246,9 +245,6 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
this.getDicts("sys_normal_disable").then(response => {
this.statusOptions = response.data;
});
}, },
methods: { methods: {
/** 查询字典类型列表 */ /** 查询字典类型列表 */
......
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="菜单状态" clearable size="small"> <el-select v-model="queryParams.status" placeholder="菜单状态" clearable size="small">
<el-option <el-option
v-for="dict in statusOptions" v-for="dict in dict.type.sys_normal_disable"
:key="dict.dictValue" :key="dict.value"
:label="dict.dictLabel" :label="dict.label"
:value="dict.dictValue" :value="dict.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="status" label="状态" width="80"> <el-table-column prop="status" label="状态" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="statusOptions" :value="scope.row.status"/> <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime"> <el-table-column label="创建时间" align="center" prop="createTime">
...@@ -240,10 +240,10 @@ ...@@ -240,10 +240,10 @@
</span> </span>
<el-radio-group v-model="form.visible"> <el-radio-group v-model="form.visible">
<el-radio <el-radio
v-for="dict in visibleOptions" v-for="dict in dict.type.sys_show_hide"
:key="dict.dictValue" :key="dict.value"
:label="dict.dictValue" :label="dict.value"
>{{dict.dictLabel}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -257,10 +257,10 @@ ...@@ -257,10 +257,10 @@
</span> </span>
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio <el-radio
v-for="dict in statusOptions" v-for="dict in dict.type.sys_normal_disable"
:key="dict.dictValue" :key="dict.value"
:label="dict.dictValue" :label="dict.value"
>{{dict.dictLabel}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -282,6 +282,7 @@ import IconSelect from "@/components/IconSelect"; ...@@ -282,6 +282,7 @@ import IconSelect from "@/components/IconSelect";
export default { export default {
name: "Menu", name: "Menu",
dicts: ['sys_show_hide', 'sys_normal_disable'],
components: { Treeselect, IconSelect }, components: { Treeselect, IconSelect },
data() { data() {
return { return {
...@@ -301,10 +302,6 @@ export default { ...@@ -301,10 +302,6 @@ export default {
isExpandAll: false, isExpandAll: false,
// 重新渲染表格状态 // 重新渲染表格状态
refreshTable: true, refreshTable: true,
// 显示状态数据字典
visibleOptions: [],
// 菜单状态数据字典
statusOptions: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
menuName: undefined, menuName: undefined,
...@@ -328,12 +325,6 @@ export default { ...@@ -328,12 +325,6 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
this.getDicts("sys_show_hide").then(response => {
this.visibleOptions = response.data;
});
this.getDicts("sys_normal_disable").then(response => {
this.statusOptions = response.data;
});
}, },
methods: { methods: {
// 选择图标 // 选择图标
......
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
<el-form-item label="类型" prop="noticeType"> <el-form-item label="类型" prop="noticeType">
<el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable size="small"> <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable size="small">
<el-option <el-option
v-for="dict in typeOptions" v-for="dict in dict.type.sys_notice_type"
:key="dict.dictValue" :key="dict.value"
:label="dict.dictLabel" :label="dict.label"
:value="dict.dictValue" :value="dict.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -82,12 +82,12 @@ ...@@ -82,12 +82,12 @@
/> />
<el-table-column label="公告类型" align="center" prop="noticeType" width="100"> <el-table-column label="公告类型" align="center" prop="noticeType" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="typeOptions" :value="scope.row.noticeType"/> <dict-tag :options="dict.type.sys_notice_type" :value="scope.row.noticeType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center" prop="status" width="100"> <el-table-column label="状态" align="center" prop="status" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="statusOptions" :value="scope.row.status"/> <dict-tag :options="dict.type.sys_notice_status" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建者" align="center" prop="createBy" width="100" /> <el-table-column label="创建者" align="center" prop="createBy" width="100" />
...@@ -137,10 +137,10 @@ ...@@ -137,10 +137,10 @@
<el-form-item label="公告类型" prop="noticeType"> <el-form-item label="公告类型" prop="noticeType">
<el-select v-model="form.noticeType" placeholder="请选择"> <el-select v-model="form.noticeType" placeholder="请选择">
<el-option <el-option
v-for="dict in typeOptions" v-for="dict in dict.type.sys_notice_type"
:key="dict.dictValue" :key="dict.value"
:label="dict.dictLabel" :label="dict.label"
:value="dict.dictValue" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -149,10 +149,10 @@ ...@@ -149,10 +149,10 @@
<el-form-item label="状态"> <el-form-item label="状态">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio <el-radio
v-for="dict in statusOptions" v-for="dict in dict.type.sys_notice_status"
:key="dict.dictValue" :key="dict.value"
:label="dict.dictValue" :label="dict.value"
>{{dict.dictLabel}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -176,6 +176,7 @@ import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "@/api ...@@ -176,6 +176,7 @@ import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "@/api
export default { export default {
name: "Notice", name: "Notice",
dicts: ['sys_notice_status', 'sys_notice_type'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -196,10 +197,6 @@ export default { ...@@ -196,10 +197,6 @@ export default {
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 类型数据字典
statusOptions: [],
// 状态数据字典
typeOptions: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -223,12 +220,6 @@ export default { ...@@ -223,12 +220,6 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
this.getDicts("sys_notice_status").then(response => {
this.statusOptions = response.data;
});
this.getDicts("sys_notice_type").then(response => {
this.typeOptions = response.data;
});
}, },
methods: { methods: {
/** 查询公告列表 */ /** 查询公告列表 */
......
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="岗位状态" clearable size="small"> <el-select v-model="queryParams.status" placeholder="岗位状态" clearable size="small">
<el-option <el-option
v-for="dict in statusOptions" v-for="dict in dict.type.sys_normal_disable"
:key="dict.dictValue" :key="dict.value"
:label="dict.dictLabel" :label="dict.label"
:value="dict.dictValue" :value="dict.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<el-table-column label="岗位排序" align="center" prop="postSort" /> <el-table-column label="岗位排序" align="center" prop="postSort" />
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="statusOptions" :value="scope.row.status"/> <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column label="创建时间" align="center" prop="createTime" width="180">
...@@ -141,10 +141,10 @@ ...@@ -141,10 +141,10 @@
<el-form-item label="岗位状态" prop="status"> <el-form-item label="岗位状态" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio <el-radio
v-for="dict in statusOptions" v-for="dict in dict.type.sys_normal_disable"
:key="dict.dictValue" :key="dict.value"
:label="dict.dictValue" :label="dict.value"
>{{dict.dictLabel}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
...@@ -164,6 +164,7 @@ import { listPost, getPost, delPost, addPost, updatePost, exportPost } from "@/a ...@@ -164,6 +164,7 @@ import { listPost, getPost, delPost, addPost, updatePost, exportPost } from "@/a
export default { export default {
name: "Post", name: "Post",
dicts: ['sys_normal_disable'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -186,8 +187,6 @@ export default { ...@@ -186,8 +187,6 @@ export default {
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 状态数据字典
statusOptions: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -214,9 +213,6 @@ export default { ...@@ -214,9 +213,6 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
this.getDicts("sys_normal_disable").then(response => {
this.statusOptions = response.data;
});
}, },
methods: { methods: {
/** 查询岗位列表 */ /** 查询岗位列表 */
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" /> <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="statusOptions" :value="scope.row.status"/> <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column label="创建时间" align="center" prop="createTime" width="180">
...@@ -107,6 +107,7 @@ import selectUser from "./selectUser"; ...@@ -107,6 +107,7 @@ import selectUser from "./selectUser";
export default { export default {
name: "AuthUser", name: "AuthUser",
dicts: ['sys_normal_disable'],
components: { selectUser }, components: { selectUser },
data() { data() {
return { return {
...@@ -122,8 +123,6 @@ export default { ...@@ -122,8 +123,6 @@ export default {
total: 0, total: 0,
// 用户表格数据 // 用户表格数据
userList: [], userList: [],
// 状态数据字典
statusOptions: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -139,9 +138,6 @@ export default { ...@@ -139,9 +138,6 @@ export default {
if (roleId) { if (roleId) {
this.queryParams.roleId = roleId; this.queryParams.roleId = roleId;
this.getList(); this.getList();
this.getDicts("sys_normal_disable").then(response => {
this.statusOptions = response.data;
});
} }
}, },
methods: { methods: {
......
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
style="width: 240px" style="width: 240px"
> >
<el-option <el-option
v-for="dict in statusOptions" v-for="dict in dict.type.sys_normal_disable"
:key="dict.dictValue" :key="dict.value"
:label="dict.dictLabel" :label="dict.label"
:value="dict.dictValue" :value="dict.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -183,10 +183,10 @@ ...@@ -183,10 +183,10 @@
<el-form-item label="状态"> <el-form-item label="状态">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio <el-radio
v-for="dict in statusOptions" v-for="dict in dict.type.sys_normal_disable"
:key="dict.dictValue" :key="dict.value"
:label="dict.dictValue" :label="dict.value"
>{{dict.dictLabel}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="菜单权限"> <el-form-item label="菜单权限">
...@@ -265,6 +265,7 @@ import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/system/d ...@@ -265,6 +265,7 @@ import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/system/d
export default { export default {
name: "Role", name: "Role",
dicts: ['sys_normal_disable'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -295,8 +296,6 @@ export default { ...@@ -295,8 +296,6 @@ export default {
deptNodeAll: false, deptNodeAll: false,
// 日期范围 // 日期范围
dateRange: [], dateRange: [],
// 状态数据字典
statusOptions: [],
// 数据范围选项 // 数据范围选项
dataScopeOptions: [ dataScopeOptions: [
{ {
...@@ -354,9 +353,6 @@ export default { ...@@ -354,9 +353,6 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
this.getDicts("sys_normal_disable").then(response => {
this.statusOptions = response.data;
});
}, },
methods: { methods: {
/** 查询角色列表 */ /** 查询角色列表 */
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" /> <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="statusOptions" :value="scope.row.status"/> <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column label="创建时间" align="center" prop="createTime" width="180">
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
<script> <script>
import { unallocatedUserList, authUserSelectAll } from "@/api/system/role"; import { unallocatedUserList, authUserSelectAll } from "@/api/system/role";
export default { export default {
dicts: ['sys_normal_disable'],
props: { props: {
// 角色编号 // 角色编号
roleId: { roleId: {
...@@ -77,8 +78,6 @@ export default { ...@@ -77,8 +78,6 @@ export default {
total: 0, total: 0,
// 未授权用户数据 // 未授权用户数据
userList: [], userList: [],
// 状态数据字典
statusOptions: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -89,11 +88,6 @@ export default { ...@@ -89,11 +88,6 @@ export default {
} }
}; };
}, },
created() {
this.getDicts("sys_normal_disable").then(response => {
this.statusOptions = response.data;
});
},
methods: { methods: {
// 显示弹框 // 显示弹框
show() { show() {
......
...@@ -57,10 +57,10 @@ ...@@ -57,10 +57,10 @@
style="width: 240px" style="width: 240px"
> >
<el-option <el-option
v-for="dict in statusOptions" v-for="dict in dict.type.sys_normal_disable"
:key="dict.dictValue" :key="dict.value"
:label="dict.dictLabel" :label="dict.label"
:value="dict.dictValue" :value="dict.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -251,10 +251,10 @@ ...@@ -251,10 +251,10 @@
<el-form-item label="用户性别"> <el-form-item label="用户性别">
<el-select v-model="form.sex" placeholder="请选择"> <el-select v-model="form.sex" placeholder="请选择">
<el-option <el-option
v-for="dict in sexOptions" v-for="dict in dict.type.sys_user_sex"
:key="dict.dictValue" :key="dict.value"
:label="dict.dictLabel" :label="dict.label"
:value="dict.dictValue" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -263,10 +263,10 @@ ...@@ -263,10 +263,10 @@
<el-form-item label="状态"> <el-form-item label="状态">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio <el-radio
v-for="dict in statusOptions" v-for="dict in dict.type.sys_normal_disable"
:key="dict.dictValue" :key="dict.value"
:label="dict.dictValue" :label="dict.value"
>{{dict.dictLabel}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -354,6 +354,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css"; ...@@ -354,6 +354,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: "User", name: "User",
dicts: ['sys_normal_disable', 'sys_user_sex'],
components: { Treeselect }, components: { Treeselect },
data() { data() {
return { return {
...@@ -385,10 +386,6 @@ export default { ...@@ -385,10 +386,6 @@ export default {
initPassword: undefined, initPassword: undefined,
// 日期范围 // 日期范围
dateRange: [], dateRange: [],
// 状态数据字典
statusOptions: [],
// 性别状态字典
sexOptions: [],
// 岗位选项 // 岗位选项
postOptions: [], postOptions: [],
// 角色选项 // 角色选项
...@@ -472,12 +469,6 @@ export default { ...@@ -472,12 +469,6 @@ export default {
created() { created() {
this.getList(); this.getList();
this.getTreeselect(); this.getTreeselect();
this.getDicts("sys_normal_disable").then(response => {
this.statusOptions = response.data;
});
this.getDicts("sys_user_sex").then(response => {
this.sexOptions = response.data;
});
this.getConfigKey("sys.user.initPassword").then(response => { this.getConfigKey("sys.user.initPassword").then(response => {
this.initPassword = response.msg; this.initPassword = response.msg;
}); });
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment