diff --git a/Web/src/views/system/dict/index.vue b/Web/src/views/system/dict/index.vue
index df7853fd54d20188356cf3ef00015e9eb98c2519..271f365adcafa6fec928afef33efc2a4543cca34 100644
--- a/Web/src/views/system/dict/index.vue
+++ b/Web/src/views/system/dict/index.vue
@@ -1,17 +1,17 @@
-
+
-
+
-
+
- 查询
- 重置
+ 查询
+ 重置
@@ -20,94 +20,214 @@
-
-
-
-
-
-
-
- 启用
- 禁用
-
-
-
-
-
-
-
-
- 详情
-
+
+
+
+
+
+
+
+
+
+ 启用
+ 禁用
-
-
-
-
- 创建者
+
+
+
+
+
+
+
+ 详情
- {{ scope.row.createUserName ?? '无' }}
-
-
-
-
- 创建时间
-
-
- {{ scope.row.createTime ?? '无' }}
-
-
-
-
- 修改者
-
-
- {{ scope.row.updateUserName ?? '无' }}
-
-
-
-
- 修改时间
-
-
- {{ scope.row.updateTime ?? '无' }}
-
-
-
-
- 备注
+
+
+
+
+ 创建者
+
+
+ {{ scope.row.createUserName ?? '无' }}
+
+
+
+
+ 创建时间
+
+
+ {{ scope.row.createTime ?? '无' }}
+
+
+
+
+ 修改者
+
+
+ {{ scope.row.updateUserName ?? '无' }}
+
+
+
+
+ 修改时间
+
+
+ {{ scope.row.updateTime ?? '无' }}
+
+
+
+
+ 备注
+
+
+ {{ scope.row.remark ?? '无' }}
+
+
+
+
+
+
+
+ 编辑
+ 字典
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+ {{ scope.row.value }}
+
+
+
+
+
+ 启用
+ 禁用
+
+
+
+
+
+ 空
+ 有值
+
+
+
+
+
+
+
+ 详情
- {{ scope.row.remark }}
-
-
-
-
-
-
-
- 编辑
- 字典
- 删除
-
-
-
-
-
+
+
+
+
+ 创建者
+
+
+ {{ scope.row.createUserName ?? '无' }}
+
+
+
+
+ 创建时间
+
+
+ {{ scope.row.createTime ?? '无' }}
+
+
+
+
+ 修改者
+
+
+ {{ scope.row.updateUserName ?? '无' }}
+
+
+
+
+ 修改时间
+
+
+ {{ scope.row.updateTime ?? '无' }}
+
+
+
+
+ 备注
+
+
+ {{ scope.row.remark ?? '无' }}
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
-
-
+
+
+
@@ -115,68 +235,113 @@
import { onMounted, reactive, ref } from 'vue';
import { ElMessageBox, ElMessage } from 'element-plus';
import EditDictType from '/@/views/system/dict/component/editDictType.vue';
-import DictDataDialog from '/@/views/system/dict/component/dictDataDialog.vue';
+import EditDictData from '/@/views/system/dict/component/editDictData.vue';
+
+// import DictDataDialog from '/@/views/system/dict/component/dictDataDialog.vue';
import { getAPI } from '/@/utils/axios-utils';
-import { SysDictTypeApi } from '/@/api-services/api';
-import { SysDictType } from '/@/api-services/models';
+import { SysDictTypeApi, SysDictDataApi } from '/@/api-services/api';
+import { SysDictType, SysDictData } from '/@/api-services/models';
const editDictTypeRef = ref>();
-const dictDataDialogRef = ref>();
+const editDictDataRef = ref>();
+// const dictDataDialogRef = ref>();
const state = reactive({
loading: false,
dictTypeData: [] as Array,
- queryParams: {
+ dictDataData: [] as Array,
+ queryDictTypeParams: {
name: undefined,
code: undefined,
},
- tableParams: {
+ tableDictTypeParams: {
+ page: 1,
+ pageSize: 20,
+ total: 0 as any,
+ },
+ queryDictDataParams: {
+ name: undefined,
+ code: undefined,
+ dictTypeId: 0, // 字典类型Id
+ },
+ tableDictDataParams: {
page: 1,
pageSize: 20,
total: 0 as any,
},
editDictTypeTitle: '',
+ editDictDataTitle: '',
});
onMounted(async () => {
- handleQuery();
+ handleDictTypeQuery();
});
-// 查询操作
-const handleQuery = async () => {
+// 查询字典操作
+const handleDictTypeQuery = async () => {
state.loading = true;
- let params = Object.assign(state.queryParams, state.tableParams);
+ let params = Object.assign(state.queryDictTypeParams, state.tableDictTypeParams);
var res = await getAPI(SysDictTypeApi).apiSysDictTypePagePost(params);
state.dictTypeData = res.data.result?.items ?? [];
- state.tableParams.total = res.data.result?.total;
+ state.tableDictTypeParams.total = res.data.result?.total;
+ state.loading = false;
+};
+
+// 查询字典值操作
+const handleDictDataQuery = async () => {
+ state.loading = true;
+ let params = Object.assign(state.queryDictDataParams, state.tableDictDataParams);
+ var res = await getAPI(SysDictDataApi).apiSysDictDataPagePost(params);
+ state.dictDataData = res.data.result?.items ?? [];
+ state.tableDictDataParams.total = res.data.result?.total;
state.loading = false;
};
-// 重置操作
-const resetQuery = () => {
- state.queryParams.name = undefined;
- state.queryParams.code = undefined;
- handleQuery();
+// 重置字典操作
+const resetDictTypeQuery = () => {
+ state.queryDictTypeParams.name = undefined;
+ state.queryDictTypeParams.code = undefined;
+ handleDictTypeQuery();
};
-// 打开新增页面
+// 重置字典值操作
+const resetDictDataQuery = () => {
+ state.queryDictDataParams.name = undefined;
+ state.queryDictDataParams.code = undefined;
+ handleDictDataQuery();
+};
+
+// 打开新增字典页面
const openAddDictType = () => {
state.editDictTypeTitle = '添加字典';
editDictTypeRef.value?.openDialog({ status: 1, orderNo: 100 });
};
-// 打开编辑页面
+// 打开新增字典值页面
+const openAddDictData = () => {
+ state.editDictDataTitle = '添加字典值';
+ editDictDataRef.value?.openDialog({ status: 1, orderNo: 100, dictTypeId: state.queryDictDataParams.dictTypeId });
+};
+
+// 打开编辑字典页面
const openEditDictType = (row: any) => {
state.editDictTypeTitle = '编辑字典';
editDictTypeRef.value?.openDialog(row);
};
+// 打开编辑字典值页面
+const openEditDictData = (row: any) => {
+ state.editDictDataTitle = '编辑字典值';
+ editDictDataRef.value?.openDialog(row);
+};
+
// 打开字典值页面
const openDictDataDialog = (row: any) => {
- dictDataDialogRef.value?.openDialog(row);
+ state.queryDictDataParams.dictTypeId = row.id;
+ handleDictDataQuery();
};
-// 删除
+// 删除字典
const delDictType = (row: any) => {
ElMessageBox.confirm(`确定删除字典：【${row.name}】?`, '提示', {
confirmButtonText: '确定',
@@ -185,21 +350,48 @@ const delDictType = (row: any) => {
})
.then(async () => {
await getAPI(SysDictTypeApi).apiSysDictTypeDeletePost({ id: row.id });
- handleQuery();
+ handleDictTypeQuery();
ElMessage.success('删除成功');
})
.catch(() => {});
};
-// 改变页面容量
-const handleSizeChange = (val: number) => {
- state.tableParams.pageSize = val;
- handleQuery();
+// 删除字典值
+const delDictData = (row: any) => {
+ ElMessageBox.confirm(`确定删除字典值：【${row.value}】?`, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then(async () => {
+ await getAPI(SysDictDataApi).apiSysDictDataDeletePost({ id: row.id });
+ handleDictDataQuery();
+ ElMessage.success('删除成功');
+ })
+ .catch(() => {});
+};
+
+// 改变字典页面容量
+const handleDictTypeSizeChange = (val: number) => {
+ state.tableDictTypeParams.pageSize = val;
+ handleDictTypeQuery();
+};
+
+// 改变字典页码序号
+const handleDictTypeCurrentChange = (val: number) => {
+ state.tableDictTypeParams.page = val;
+ handleDictTypeQuery();
+};
+
+// 改变字典值页面容量
+const handleDictDataSizeChange = (val: number) => {
+ state.tableDictDataParams.pageSize = val;
+ handleDictDataQuery();
};
-// 改变页码序号
-const handleCurrentChange = (val: number) => {
- state.tableParams.page = val;
- handleQuery();
+// 改变字典值页码序号
+const handleDictDataCurrentChange = (val: number) => {
+ state.tableDictDataParams.page = val;
+ handleDictDataQuery();
};
-
+
\ No newline at end of file