From ec99136e6a43f0a251b476cf1d4782cf3691ea8c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 24 二月 2025 15:28:26 +0800
Subject: [PATCH] #修改 字典页修改
---
rsf-admin/src/page/dictType/DictTypeList.jsx | 3 ++-
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/DictType.java | 8 ++++----
rsf-admin/src/page/dictType/DictTypeEdit.jsx | 7 +++++++
rsf-admin/src/page/basicInfo/companys/index.jsx | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictTypeController.java | 13 +++++++++++--
rsf-admin/src/i18n/zh.js | 1 +
rsf-admin/src/i18n/en.js | 5 +++--
rsf-admin/src/page/dictType/DictTypePanel.jsx | 6 ++++++
rsf-admin/src/page/dictType/DictTypeCreate.jsx | 7 +++++++
9 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 070ab41..9931132 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -343,8 +343,9 @@
name: "name",
},
dictType: {
- name: "name",
- description: "description",
+ code: "Code",
+ name: "Name",
+ description: "Description",
},
dictData: {
dictTypeId: "dictTypeId",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index d9d40da..8e33392 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -342,6 +342,7 @@
name: "鍚嶇О",
},
dictType: {
+ code: "瀛楀吀缂栫爜",
name: "瀛楀吀鍚嶇О",
description: "鍐呭鎻忚堪",
},
diff --git a/rsf-admin/src/page/basicInfo/companys/index.jsx b/rsf-admin/src/page/basicInfo/companys/index.jsx
index afa36e5..5874d79 100644
--- a/rsf-admin/src/page/basicInfo/companys/index.jsx
+++ b/rsf-admin/src/page/basicInfo/companys/index.jsx
@@ -12,7 +12,7 @@
list: CompanysList,
edit: CompanysEdit,
show: ShowGuesser,
- recordRepresentation: (record) => {
+ recordRepresentation: (record) => {0
return `${record.name}`
}
};
diff --git a/rsf-admin/src/page/dictType/DictTypeCreate.jsx b/rsf-admin/src/page/dictType/DictTypeCreate.jsx
index 1425007..d652cba 100644
--- a/rsf-admin/src/page/dictType/DictTypeCreate.jsx
+++ b/rsf-admin/src/page/dictType/DictTypeCreate.jsx
@@ -84,6 +84,13 @@
</DialogTitle>
<DialogContent sx={{ mt: 2 }}>
<Grid container rowSpacing={2} columnSpacing={2}>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.dictType.code"
+ source="code"
+ parse={v => v}
+ />
+ </Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.dictType.name"
diff --git a/rsf-admin/src/page/dictType/DictTypeEdit.jsx b/rsf-admin/src/page/dictType/DictTypeEdit.jsx
index 31ac57a..58a64d0 100644
--- a/rsf-admin/src/page/dictType/DictTypeEdit.jsx
+++ b/rsf-admin/src/page/dictType/DictTypeEdit.jsx
@@ -65,6 +65,13 @@
</Typography>
<Stack direction='row' gap={2}>
<TextInput
+ label="table.field.dictType.code"
+ source="code"
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
label="table.field.dictType.name"
source="name"
parse={v => v}
diff --git a/rsf-admin/src/page/dictType/DictTypeList.jsx b/rsf-admin/src/page/dictType/DictTypeList.jsx
index d668008..89405ed 100644
--- a/rsf-admin/src/page/dictType/DictTypeList.jsx
+++ b/rsf-admin/src/page/dictType/DictTypeList.jsx
@@ -63,7 +63,7 @@
<DateInput label='common.time.after' source="timeStart" alwaysOn />,
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
- <TextInput source="uuid" label="table.field.dictType.uuid" />,
+ <TextInput source="code" label="table.field.dictType.code" />,
<TextInput source="name" label="table.field.dictType.name" />,
<TextInput source="description" label="table.field.dictType.description" />,
@@ -119,6 +119,7 @@
omit={['id', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
+ <TextField source="code" label="table.field.dictType.code" />
<TextField source="name" label="table.field.dictType.name" />
<TextField source="description" label="table.field.dictType.description" />
diff --git a/rsf-admin/src/page/dictType/DictTypePanel.jsx b/rsf-admin/src/page/dictType/DictTypePanel.jsx
index 846681f..3c6e787 100644
--- a/rsf-admin/src/page/dictType/DictTypePanel.jsx
+++ b/rsf-admin/src/page/dictType/DictTypePanel.jsx
@@ -40,6 +40,12 @@
</Grid>
<Box height={20}> </Box>
<Grid container spacing={2}>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.dictType.code"
+ property={record.code}
+ />
+ </Grid>
<Grid item xs={6}>
<PanelTypography
title="table.field.dictType.name"
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictTypeController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictTypeController.java
index fbeb7d9..1e06e7c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictTypeController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictTypeController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
@@ -56,9 +57,17 @@
@PostMapping("/dictType/save")
public R save(@RequestBody DictType dictType) {
dictType.setCreateBy(getLoginUserId());
- dictType.setCreateTime(new Date());
dictType.setUpdateBy(getLoginUserId());
- dictType.setUpdateTime(new Date());
+ if (Objects.isNull(dictType.getName())) {
+ throw new CoolException("瀛楀吀鍚嶇О涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(dictType.getDescription())) {
+ throw new CoolException("瀛楀吀鎻忚堪涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(dictType.getCode())) {
+ throw new CoolException("瀛楀吀缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+
if (!dictTypeService.save(dictType)) {
return R.error("Save Fail");
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/DictType.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/DictType.java
index 5faf9d4..a83874c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/DictType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/DictType.java
@@ -37,8 +37,8 @@
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
- private String uuid;
+ @ApiModelProperty(value= "缂栫爜")
+ private String code;
/**
* 鍚嶇О
@@ -105,8 +105,8 @@
public DictType() {}
- public DictType(String uuid,String name,String description,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
- this.uuid = uuid;
+ public DictType(String code,String name,String description,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.code = code;
this.name = name;
this.description = description;
this.status = status;
--
Gitblit v1.9.1