Merge remote-tracking branch 'origin/dev' into dev

whycq

2025-02-24 37e8e06c8d13146e62ef08d018d86443b9f42f00

 rsf-admin/src/page/dictData/DictDataEdit.jsx

File was renamed from rsf-admin/src/page/stock/StockEdit.jsx
@@ -40,7 +40,7 @@
    )
}

const StockEdit = () => {
const DictDataEdit = () => {
    const translate = useTranslate();

    return (
@@ -65,8 +65,8 @@
                        </Typography>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.stock.asnOrder"
                                source="asnOrder"
                                label="table.field.dictData.dictTypeId"
                                source="dictTypeId"
                                parse={v => v}
                                autoFocus
                                validate={required()}
@@ -74,57 +74,39 @@
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.stock.erpToken"
                                source="erpToken"
                                label="table.field.dictData.dictTypeCode"
                                source="dictTypeCode"
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.stock.erpOrder"
                                source="erpOrder"
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.stock.erpStkAdr"
                                source="erpStkAdr"
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.stock.contractId"
                                source="contractId"
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.stock.lockReason"
                                source="lockReason"
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.stock.lockStatus"
                                source="lockStatus"
                                validate={required()}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.stock.locker"
                                source="locker"
                                label="table.field.dictData.value"
                                source="value"
                                parse={v => v}
                                validate={required()}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <DateInput
                                label="table.field.stock.lockedTime"
                                source="lockedTime"
                            <TextInput
                                label="table.field.dictData.label"
                                source="label"
                                parse={v => v}
                                validate={required()}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.dictData.sort"
                                source="sort"
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.dictData.color"
                                source="color"
                                parse={v => v}
                            />
                        </Stack>

@@ -143,4 +125,4 @@
    )
}

export default StockEdit;
export default DictDataEdit;