wms-master.git - Gitblit

blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace

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

zjj

2025-04-09 a64d342c0371eadebc29dae2a60a9525ce95e222

 rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx

@@ -168,8 +168,14 @@
                disableMultipleColumnsSorting
                columnHeaderHeight={40}
                rowHeight={42}
                paginationModel={{ pageSize: 10, page: 1 }}
                pageSizeOptions={[10, 25, 50, 100]}
                initialState={{
                    pagination: {
                        paginationModel: {
                            pageSize: 10,
                        },
                    },
                }}
                pageSizeOptions={[10, 25, 50]}
            />
        </Box >

			@@ -168,8 +168,14 @@
			disableMultipleColumnsSorting
			columnHeaderHeight={40}
			rowHeight={42}
			paginationModel={{ pageSize: 10, page: 1 }}
			pageSizeOptions={[10, 25, 50, 100]}
			initialState={{
			pagination: {
			paginationModel: {
			pageSize: 10,
			},
			},
			}}
			pageSizeOptions={[10, 25, 50]}
			/>
			</Box >