From 401e85bb3749bb9107f65ddaa15868a0a9ba852e Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期五, 11 四月 2025 14:18:46 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/system/dicts/dictType/DictDataCreate.jsx | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/rsf-admin/src/page/system/dicts/dictData/DictDataCreate.jsx b/rsf-admin/src/page/system/dicts/dictType/DictDataCreate.jsx
similarity index 94%
rename from rsf-admin/src/page/system/dicts/dictData/DictDataCreate.jsx
rename to rsf-admin/src/page/system/dicts/dictType/DictDataCreate.jsx
index afc4ea0..058996b 100644
--- a/rsf-admin/src/page/system/dicts/dictData/DictDataCreate.jsx
+++ b/rsf-admin/src/page/system/dicts/dictType/DictDataCreate.jsx
@@ -32,8 +32,7 @@
import MemoInput from "../../../components/MemoInput";
const DictDataCreate = (props) => {
- const { open, setOpen, row } = props;
-
+ const { open, setOpen, record } = props;
const translate = useTranslate();
const notify = useNotify();
@@ -55,6 +54,7 @@
return (
<>
<CreateBase
+ resource="dictData"
record={{}}
transform={(data) => {
return data;
@@ -88,10 +88,10 @@
<TextInput
label="table.field.dictData.dictTypeId"
source="dictTypeId"
+ defaultValue={record?.id}
parse={v => v}
- autoFocus
+ readOnly
validate={required()}
- defaultValue={row.dictTypeId}
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
@@ -99,8 +99,9 @@
label="table.field.dictData.dictTypeCode"
source="dictTypeCode"
parse={v => v}
+ readOnly
+ defaultValue={record?.code}
validate={required()}
- defaultValue={row.dictTypeCode}
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
@@ -115,6 +116,7 @@
<TextInput
label="table.field.dictData.label"
validate={required()}
+ autoFocus
source="label"
parse={v => v}
/>
--
Gitblit v1.9.1