From 60f974487c6212f4cf0604dcd69ef54196031c05 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 18 四月 2025 13:42:03 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/system/serialRule/SerialRuleItemEdit.jsx | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/rsf-admin/src/page/system/serialRule/SerialRuleItemEdit.jsx b/rsf-admin/src/page/system/serialRule/SerialRuleItemEdit.jsx
index ca3b86c..4dc8087 100644
--- a/rsf-admin/src/page/system/serialRule/SerialRuleItemEdit.jsx
+++ b/rsf-admin/src/page/system/serialRule/SerialRuleItemEdit.jsx
@@ -19,6 +19,7 @@
NumberField,
required,
useRecordContext,
+ useGetOne,
DeleteButton,
} from 'react-admin';
import { useWatch, useFormContext } from "react-hook-form";
@@ -35,7 +36,7 @@
const { getValues } = useFormContext();
return (
- <Toolbar sx={{ justifyContent: 'space-between' }}>
+ <Toolbar sx={{ justifyContent: 'end' }}>
<SaveButton />
<DeleteButton mutationMode="optimistic" />
</Toolbar>
@@ -45,15 +46,18 @@
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 }
+
return (
<Edit
id={record.id}
- redirect="list"
resource="serialRuleItem"
mutationMode={EDIT_MODE}
>
@@ -99,12 +103,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
--
Gitblit v1.9.1