From b778c28b598eecd0687f0612f9236c6e957de89f Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期四, 03 四月 2025 16:59:34 +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 | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
index 3153ccb..0d858d2 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 = ({ setBillReload }) => {
const record = useRecordContext();
if (!record) return null;
const translate = useTranslate();
@@ -25,7 +26,13 @@
useEffect(() => {
debouncedHttp({ maktx });
+ setBillReload(http)
}, [asnId, maktx]);
+
+ useEffect(() => {
+ setBillReload(http)
+ }, []);
+
const http = async (parmas) => {
@@ -36,6 +43,7 @@
notify(res.data.msg);
}
}
+
const debouncedHttp = useMemo(() => debounce(http, 300), []);
@@ -48,7 +56,8 @@
},
{
field: 'asnCode',
- headerName: translate('table.field.asnOrderItem.asnCode')
+ headerName: translate('table.field.asnOrderItem.asnCode'),
+ width: 150,
},
{
field: 'poDetlId',
@@ -59,12 +68,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 +111,8 @@
},
{
field: 'trackCode',
- headerName: translate('table.field.asnOrderItem.barcode')
+ headerName: translate('table.field.asnOrderItem.barcode'),
+ width: 150
},
{
field: 'prodTime',
@@ -140,7 +152,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