From 6c1d09d5e692f0b43f5dfb2288a4aef728046b06 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 四月 2025 16:51:25 +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 | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
index 221fe55..61763e5 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
@@ -15,7 +15,7 @@
import { DataGrid } from '@mui/x-data-grid';
import PrintModal from './PrintModal';
import { width } from "@mui/system";
-const AsnOrderPanel = () => {
+const AsnOrderPanel = ({ billReload }) => {
const record = useRecordContext();
if (!record) return null;
const translate = useTranslate();
@@ -28,7 +28,6 @@
debouncedHttp({ maktx });
}, [asnId, maktx]);
-
const http = async (parmas) => {
const res = await request.post('/asnOrderItem/page', { ...parmas, asnId });
if (res?.data?.code === 200) {
@@ -38,9 +37,13 @@
}
}
+
+ useEffect(() => {
+ billReload.current = http
+ }, []);
+
+
const debouncedHttp = useMemo(() => debounce(http, 300), []);
-
-
const columns = [
{
@@ -49,7 +52,8 @@
},
{
field: 'asnCode',
- headerName: translate('table.field.asnOrderItem.asnCode')
+ headerName: translate('table.field.asnOrderItem.asnCode'),
+ width: 150,
},
{
field: 'poDetlId',
@@ -61,7 +65,8 @@
},
{
field: 'matnrCode',
- headerName: translate('table.field.asnOrderItem.matnrCode')
+ headerName: translate('table.field.asnOrderItem.matnrCode'),
+ width: 150,
},
{
field: 'maktx',
@@ -102,7 +107,8 @@
},
{
field: 'trackCode',
- headerName: translate('table.field.asnOrderItem.barcode')
+ headerName: translate('table.field.asnOrderItem.barcode'),
+ width: 150
},
{
field: 'prodTime',
@@ -142,7 +148,7 @@
}}>
<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' }} />
+ <TextField value={maktx} onChange={(e) => maktxChange(e.target.value)} label="鎼滅储鐗╂枡" variant="outlined" sx={{ width: '300px' }} size="small" />
<div style={{ display: 'flex', gap: '10px' }}>
<PrintsButton rows={selectedRows} />
--
Gitblit v1.9.1