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

whycq

2025-02-24 37e8e06c8d13146e62ef08d018d86443b9f42f00

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

File was renamed from rsf-admin/src/page/stock/StockPanel.jsx
@@ -7,7 +7,7 @@
import PanelTypography from "../components/PanelTypography";
import * as Common from '@/utils/common'

const StockPanel = () => {
const DictDataPanel = () => {
    const record = useRecordContext();
    if (!record) return null;
    const translate = useTranslate();
@@ -23,7 +23,7 @@
                                overflow: 'hidden',
                                textOverflow: 'ellipsis',
                            }}>
                                {Common.camelToPascalWithSpaces(translate('table.field.stock.id'))}: {record.id}
                                {Common.camelToPascalWithSpaces(translate('table.field.dictData.id'))}: {record.id}
                            </Typography>
                            {/*  inherit, primary, secondary, textPrimary, textSecondary, error */}
                            <Typography variant="h6" gutterBottom align="right" >
@@ -42,56 +42,38 @@
                    <Grid container spacing={2}>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.stock.asnOrder" 
                                property={record.asnOrder}
                                title="table.field.dictData.dictTypeId" 
                                property={record.dictTypeId$}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.stock.erpToken" 
                                property={record.erpToken}
                                title="table.field.dictData.dictTypeCode" 
                                property={record.dictTypeCode}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.stock.erpOrder" 
                                property={record.erpOrder}
                                title="table.field.dictData.value" 
                                property={record.value}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.stock.erpStkAdr" 
                                property={record.erpStkAdr}
                                title="table.field.dictData.label" 
                                property={record.label}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.stock.contractId" 
                                property={record.contractId$}
                                title="table.field.dictData.sort" 
                                property={record.sort}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.stock.lockReason" 
                                property={record.lockReason}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.stock.lockStatus" 
                                property={record.lockStatus}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.stock.locker" 
                                property={record.locker}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.stock.lockedTime" 
                                property={record.lockedTime$}
                                title="table.field.dictData.color" 
                                property={record.color}
                            />
                        </Grid>

@@ -102,4 +84,4 @@
    );
};

export default StockPanel;
export default DictDataPanel;