From d6775a4b96a6a3ded3be9d3f2044ba3f91c070a1 Mon Sep 17 00:00:00 2001
From: DESKTOP-LMJ82IJ\Eno <creaycat@gmail.com>
Date: 星期日, 13 四月 2025 15:07:59 +0800
Subject: [PATCH] #修改 编码规则修改
---
rsf-admin/src/page/system/serialRule/SerialRuleEdit.jsx | 9 ++++++---
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java | 4 +++-
rsf-admin/src/page/system/serialRule/SerialRuleItemEdit.jsx | 15 +++++++++------
rsf-admin/src/page/system/serialRule/SerialRuleList.jsx | 5 +++--
rsf-admin/src/i18n/zh.js | 4 ++--
5 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index d1e20f5..dc16f18 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -482,8 +482,8 @@
},
serialRuleItem: {
ruleId: "瑙勫垯鏍囪瘑",
- wkType: "瑙勫垯绫诲瀷",
- feildValue: "瑙勫垯鍙傛暟",
+ wkType: "绫诲瀷",
+ feildValue: "绫诲瀷鍙傛暟",
len: "鎴彇闀垮害",
lenStr: "鎴彇璧峰浣嶇疆",
sort: "鎺掑簭",
diff --git a/rsf-admin/src/page/system/serialRule/SerialRuleEdit.jsx b/rsf-admin/src/page/system/serialRule/SerialRuleEdit.jsx
index 53cf77d..c343e76 100644
--- a/rsf-admin/src/page/system/serialRule/SerialRuleEdit.jsx
+++ b/rsf-admin/src/page/system/serialRule/SerialRuleEdit.jsx
@@ -43,6 +43,7 @@
const SerialRuleEdit = () => {
const translate = useTranslate();
+ const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_task_reset_type')) || [];
return (
<>
@@ -84,12 +85,14 @@
/>
</Stack>
<Stack direction='row' gap={2}>
- <TextInput
+ <AutocompleteInput
+ choices={dicts}
+ optionText="label"
label="table.field.serialRule.reset"
source="reset"
+ optionValue="value"
parse={v => v}
- validate={required()}
- />
+ validate={[required()]} />
<TextInput
label="table.field.serialRule.resetDep"
source="resetDep"
diff --git a/rsf-admin/src/page/system/serialRule/SerialRuleItemEdit.jsx b/rsf-admin/src/page/system/serialRule/SerialRuleItemEdit.jsx
index 8cf98bf..22117c7 100644
--- a/rsf-admin/src/page/system/serialRule/SerialRuleItemEdit.jsx
+++ b/rsf-admin/src/page/system/serialRule/SerialRuleItemEdit.jsx
@@ -46,13 +46,14 @@
const SerialRuleItemEdit = (props) => {
const { open, setOpen, record } = props;
const translate = useTranslate();
+ const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_rule_item_type')) || [];
const handleClose = (event, reason) => {
if (reason !== "backdropClick") {
setOpen(false);
}
};
- const {data, isPending, } = useGetOne('serialRuleItem', {id: record?.id});
- if (data == null || data == undefined) {return}
+ const { data, isPending, } = useGetOne('serialRuleItem', { id: record?.id });
+ if (data == null || data == undefined) { return }
return (
<Edit
@@ -103,12 +104,14 @@
/>
</Stack>
<Stack direction='row' gap={2}>
- <TextInput
+ <AutocompleteInput
+ choices={dicts}
+ optionText="label"
label="table.field.serialRuleItem.wkType"
- source="wkType$"
- readOnly
+ source="wkType"
+ optionValue="value"
parse={v => v}
- />
+ />
</Stack>
<Stack direction='row' gap={2}>
<TextInput
diff --git a/rsf-admin/src/page/system/serialRule/SerialRuleList.jsx b/rsf-admin/src/page/system/serialRule/SerialRuleList.jsx
index d7a19a9..0e8a0c5 100644
--- a/rsf-admin/src/page/system/serialRule/SerialRuleList.jsx
+++ b/rsf-admin/src/page/system/serialRule/SerialRuleList.jsx
@@ -95,6 +95,7 @@
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
const [detailDialog, setDetailDialog] = useState(false);
+ const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_rule_item_type')) || [];
// const navigate = useNavigate();
// const assign = (record) => {
@@ -148,7 +149,7 @@
<TextField source="code" label="table.field.serialRule.code" />
<TextField source="name" label="table.field.serialRule.name" />
<TextField source="delimit" label="table.field.serialRule.delimit" />
- <TextField source="reset" label="table.field.serialRule.reset" />
+ <TextField label="table.field.serialRule.reset" source="reset$" />
<TextField
source="resetDep"
label="table.field.serialRule.resetDep"
@@ -165,7 +166,7 @@
<TextField
source="updateBy$"
label="common.field.updateBy"
- />
+ />
<DateField
source="updateTime"
label="common.field.updateTime"
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
index 12f7d3f..329be84 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
@@ -178,8 +178,10 @@
return " 骞�";
case "month":
return " 鏈�";
- case "day":
+ case "dd":
return " 澶�";
+ case "non":
+ return " 鏃�";
default:
return String.valueOf(this.reset);
}
--
Gitblit v1.9.1