From aa0aaf8b2091c551a73c851ed692f6d908fea8fb Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 08 四月 2025 08:41:57 +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 | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
index 3153ccb..61763e5 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
@@ -14,7 +14,8 @@
import debounce from 'lodash/debounce';
import { DataGrid } from '@mui/x-data-grid';
import PrintModal from './PrintModal';
-const AsnOrderPanel = () => {
+import { width } from "@mui/system";
+const AsnOrderPanel = ({ billReload }) => {
const record = useRecordContext();
if (!record) return null;
const translate = useTranslate();
@@ -27,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) {
@@ -37,9 +37,13 @@
}
}
+
+ useEffect(() => {
+ billReload.current = http
+ }, []);
+
+
const debouncedHttp = useMemo(() => debounce(http, 300), []);
-
-
const columns = [
{
@@ -48,7 +52,8 @@
},
{
field: 'asnCode',
- headerName: translate('table.field.asnOrderItem.asnCode')
+ headerName: translate('table.field.asnOrderItem.asnCode'),
+ width: 150,
},
{
field: 'poDetlId',
@@ -59,12 +64,14 @@
headerName: translate('table.field.asnOrderItem.poDetlCode')
},
{
- field: 'matnrId',
- headerName: translate('table.field.asnOrderItem.matnrId')
+ field: 'matnrCode',
+ headerName: translate('table.field.asnOrderItem.matnrCode'),
+ width: 150,
},
{
field: 'maktx',
- headerName: translate('table.field.asnOrderItem.maktx')
+ headerName: translate('table.field.asnOrderItem.maktx'),
+ width: 200,
},
{
field: 'anfme',
@@ -100,7 +107,8 @@
},
{
field: 'trackCode',
- headerName: translate('table.field.asnOrderItem.barcode')
+ headerName: translate('table.field.asnOrderItem.barcode'),
+ width: 150
},
{
field: 'prodTime',
@@ -140,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