From 98d4db97d3c21f9b31f978249c5572fdae948088 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 09 四月 2025 13:21:22 +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 | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
index 0d858d2..23d04c3 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
@@ -14,8 +14,8 @@
import debounce from 'lodash/debounce';
import { DataGrid } from '@mui/x-data-grid';
import PrintModal from './PrintModal';
-import { width } from "@mui/system";
-const AsnOrderPanel = ({ setBillReload }) => {
+import PrintIcon from '@mui/icons-material/Print';
+const AsnOrderPanel = ({ billReload }) => {
const record = useRecordContext();
if (!record) return null;
const translate = useTranslate();
@@ -26,14 +26,7 @@
useEffect(() => {
debouncedHttp({ maktx });
- setBillReload(http)
}, [asnId, maktx]);
-
- useEffect(() => {
- setBillReload(http)
- }, []);
-
-
const http = async (parmas) => {
const res = await request.post('/asnOrderItem/page', { ...parmas, asnId });
@@ -45,9 +38,12 @@
}
+ useEffect(() => {
+ billReload.current = http
+ }, []);
+
+
const debouncedHttp = useMemo(() => debounce(http, 300), []);
-
-
const columns = [
{
@@ -144,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} />
@@ -161,6 +155,7 @@
<DataGrid
+ sx={{ width: 'calc(100vw - 280px)' }}
size="small"
rows={rows}
columns={columns}
@@ -171,6 +166,10 @@
disableColumnMenu={true}
disableColumnSorting
disableMultipleColumnsSorting
+ columnHeaderHeight={40}
+ rowHeight={42}
+ paginationModel={{ pageSize: 10, page: 1 }}
+ pageSizeOptions={[10, 25, 50, 100]}
/>
</Box >
@@ -200,7 +199,7 @@
return (
<>
- <Button size="small" variant="contained" color="secondary" onClick={modalChange}>{translate("toolbar.batchPrint")}</Button>
+ <Button size="small" color="secondary" onClick={modalChange} startIcon={<PrintIcon />}>{translate("toolbar.batchPrint")}</Button>
<PrintModal
open={createDialog}
@@ -222,7 +221,7 @@
return (
<>
- <Button size="small" variant="contained" color="secondary" onClick={() => setCreateDialog(true)}>{translate("toolbar.print")}</Button>
+ <Button size="small" color="secondary" onClick={() => setCreateDialog(true)} startIcon={<PrintIcon />}>{translate("toolbar.print")}</Button>
<PrintModal
open={createDialog}
--
Gitblit v1.9.1