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

zjj

2025-05-23 eab76cd34bff799686f68e6b70f86c9001e4913f

 rsf-admin/src/page/statistics/stockManage/WarehouseStockList.jsx

@@ -60,20 +60,18 @@
}));



const WarehouseStockList = () => {
    const dict = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_stock_summary_code')) || [];

    const translate = useTranslate();
    const [createDialog, setCreateDialog] = useState(false);
    const [select, setSelect] = useState({});
    const [drawerVal, setDrawerVal] = useState(false);

    const filters = [
    const [filters, setFilters] = useState([
        <SearchInput source="condition" alwaysOn />,
        <NumberInput source="locId" label="table.field.locItem.locId" />,
        <TextInput source="locCode" label="table.field.locItem.locCode" />,
        <TextInput source="type" label="table.field.locItem.type" />,
        <ReferenceInput source="aggType" reference="dictData" filter={{ dictTypeCode: 'sys_stock_summary_code' }} alwaysOn>
            <AutocompleteInput optionText='label' optionValue="value" label="table.field.locItem.aggType" />
        </ReferenceInput>,
        <AutocompleteInput choices={dict} optionText='label' optionValue="value" source="aggType" label="table.field.locItem.aggType" />,
        <NumberInput source="orderItemId" label="table.field.locItem.orderItemId" />,
        <NumberInput source="wkType" label="table.field.locItem.wkType" />,
        <NumberInput source="matnrId" label="table.field.locItem.matnrId" />,
@@ -85,8 +83,9 @@
        <TextInput source="spec" label="table.field.locItem.spec" />,
        <TextInput source="model" label="table.field.locItem.model" />,
        <TextInput source="fieldsIndex" label="table.field.locItem.fieldsIndex" />,
        <TextInput label="common.field.memo" source="memo" />,
    ]
        <TextInput label="common.field.memo" source="memo" />,]);
    const [select, setSelect] = useState({});
    const [drawerVal, setDrawerVal] = useState(false);

    return (
        <>
@@ -99,10 +98,14 @@
                                duration: theme.transitions.duration.enteringScreen,
                            }),
                        marginRight: 0,
                        '& .RaAutocompleteInput-textField.MuiFormControl-root.MuiTextField-root': {
                            width: '200px'
                        }
                    }}
                    resource="warehouse/stock"
                    title={"common.button.detail"}
                    empty={false}
                    // filter={{aggType: "matnr"}}
                    filters={filters}
                    sort={{ field: "create_time", order: "desc" }}
                    actions={(
@@ -119,6 +122,7 @@
                        setDrawerVal={setDrawerVal}
                        setCreateDialog={setCreateDialog}
                        setSelect={setSelect}
                        filters={filters}
                    />
                </List>
                <WarehouseStockInfo
@@ -138,9 +142,19 @@

export default WarehouseStockList;

const PaginatedRowNumber = () => {
    const record = useRecordContext();
    const { page, perPage } = useListContext();
    const index = record.__tmp_index !== undefined ? record.__tmp_index : 0;
    //   const index = record.__tmp_index; // react-admin 内部使用的临时索引
    return <span>{(page - 1) * perPage + index + 1}</span>;
};



const DynamicFields = (props) => {
    const { setDrawerVal, setCreateDialog, setSelect } = props
    const index = 1;
    const { setDrawerVal, setCreateDialog, setSelect, filters } = props
    const translate = useTranslate();
    const notify = useNotify();
    const [columns, setColumns] = useState([]);
@@ -166,6 +180,7 @@
                <NumberField source="workQty" label="table.field.warehouseStock.qty" />,
                <TextField source="spec" label="table.field.warehouseStock.spec" />,
                <TextField source="model" label="table.field.warehouseStock.model" />,
                <TextField source="warehouse$" label="table.field.warehouseStock.warehouse" />,
                <TextField source="batch" label="table.field.warehouseStock.batch" />,
                <TextField source="unit" label="table.field.warehouseStock.unit" />,
                <TextField source="fieldsIndex" label="table.field.warehouseStock.fieldsIndex" />,
@@ -180,6 +195,18 @@
                </WrapperField>
            ]
            setColumns([...arr, ...fields, ...lastArr]);

            data.map(el => {
                var i = 0;
                filters.map((item) => {
                    if (item.key === el.fields) {
                        i = 1;
                    }
                })
                i === 0 && filters.push(<TextInput key={el.fields} source={el.fields} label={el.fieldsAlise} />)
            })
            // setFilters([...filters, ...inputFields])

        } else {
            notify(msg);
        }
@@ -216,7 +243,6 @@
const HistoriesButton = ({ setDrawerVal, setSelect }) => {
    const record = useRecordContext();
    const { filterValues } = useListContext();

    const historyClick = (event) => {
        event.stopPropagation();
        setDrawerVal(true)