From faa2a5d8d3cba12ff98c261713bff4d9cea99b79 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 09 四月 2025 17:23:40 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
index 4e7f060..3a6c137 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
@@ -140,15 +140,13 @@
}
-
return (
<Box sx={{
position: 'relative',
padding: '5px 10px'
}}>
-
<div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: '4px', alignItems: 'center' }}>
- <TextField value={maktx} onChange={(e) => maktxChange(e.target.value)} label="鎼滅储鐗╂枡" variant="outlined" sx={{ width: '300px' }} size="small" />
+ <TextField value={maktx} onChange={(e) => maktxChange(e.target.value)} label="鎼滅储鐗╂枡" sx={{ width: '300px' }} size="small" />
<div style={{ display: 'flex', gap: '10px' }}>
<PrintsButton rows={selectedRows} />
@@ -157,6 +155,7 @@
<DataGrid
+ sx={{ width: 'calc(100vw - 280px)' }}
size="small"
rows={rows}
columns={columns}
@@ -167,6 +166,16 @@
disableColumnMenu={true}
disableColumnSorting
disableMultipleColumnsSorting
+ columnHeaderHeight={40}
+ rowHeight={42}
+ initialState={{
+ pagination: {
+ paginationModel: {
+ pageSize: 10,
+ },
+ },
+ }}
+ pageSizeOptions={[10, 25, 50]}
/>
</Box >
--
Gitblit v1.9.1