From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 16:35:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/system/serialRule/SerialRuleCreate.jsx | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/page/system/serialRule/SerialRuleCreate.jsx b/rsf-admin/src/page/system/serialRule/SerialRuleCreate.jsx
index d1ef481..22985ba 100644
--- a/rsf-admin/src/page/system/serialRule/SerialRuleCreate.jsx
+++ b/rsf-admin/src/page/system/serialRule/SerialRuleCreate.jsx
@@ -47,6 +47,7 @@
setOpen(false);
notify("common.response.success");
};
+ const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_rule_type')) || [];
const handleError = async (error) => {
notify(error.message || "common.response.fail", {
@@ -113,13 +114,23 @@
parse={(v) => v}
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.serialRule.reset"
source="reset"
parse={(v) => v}
validate={required()}
/>
+ </Grid> */}
+ <Grid item xs={6} display="flex" gap={1}>
+ <AutocompleteInput
+ choices={dicts}
+ optionText="label"
+ label="table.field.serialRule.reset"
+ source="reset"
+ optionValue="value"
+ parse={v => v}
+ validate={[required()]} />
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
@@ -161,7 +172,7 @@
zIndex: 1000,
}}
>
- <Toolbar sx={{ width: "100%", justifyContent: "space-between" }}>
+ <Toolbar sx={{ width: "100%", justifyContent: "end" }}>
<SaveButton />
</Toolbar>
</DialogActions>
--
Gitblit v1.9.1