From 16a09540001bd00f01b848f0ca125d16bf314450 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 29 八月 2025 15:45:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/waveRule/WaveRuleEdit.jsx | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/page/waveRule/WaveRuleEdit.jsx b/rsf-admin/src/page/waveRule/WaveRuleEdit.jsx
index 8c3bbb7..2fee55f 100644
--- a/rsf-admin/src/page/waveRule/WaveRuleEdit.jsx
+++ b/rsf-admin/src/page/waveRule/WaveRuleEdit.jsx
@@ -42,6 +42,7 @@
const WaveRuleEdit = () => {
const translate = useTranslate();
+ const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_wave_rule_code')) || [];
return (
<Edit
@@ -68,14 +69,19 @@
label="table.field.waveRule.code"
source="code"
parse={v => v}
+ readOnly
autoFocus
/>
</Stack>
<Stack direction='row' gap={2}>
- <NumberInput
+ <AutocompleteInput
+ choices={dicts}
+ optionText="label"
label="table.field.waveRule.type"
source="type"
- />
+ optionValue="value"
+ parse={v => v}
+ validate={[required()]} />
</Stack>
<Stack direction='row' gap={2}>
<TextInput
@@ -86,14 +92,14 @@
</Stack>
</Grid>
- <Grid item xs={12} md={4}>
+ {/* <Grid item xs={12} md={4}>
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.common')}
</Typography>
<StatusSelectInput />
<Box mt="2em" />
<MemoInput />
- </Grid>
+ </Grid> */}
</Grid>
</SimpleForm>
</Edit >
--
Gitblit v1.9.1