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 | 60 +++++++++++++++++++++++++++++++-----------------------------
1 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
index a4e6655..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,23 +37,13 @@
}
}
+
+ useEffect(() => {
+ billReload.current = http
+ }, []);
+
+
const debouncedHttp = useMemo(() => debounce(http, 300), []);
-
- const StyledTableRow = styled(TableRow)(({ theme }) => ({
- "& .MuiButtonBase-root.": {
- padding: "0px 0px",
- },
- }));
-
- const StyledTableCell = styled(TableCell)(({ theme }) => ({
- "& .MuiButtonBase-root": {
- padding: "0px 0px",
- },
- overflow: "hidden",
- textOverflow: "ellipsis",
- whiteSpace: "nowrap",
- maxWidth: 600,
- }));
const columns = [
{
@@ -62,7 +52,8 @@
},
{
field: 'asnCode',
- headerName: translate('table.field.asnOrderItem.asnCode')
+ headerName: translate('table.field.asnOrderItem.asnCode'),
+ width: 150,
},
{
field: 'poDetlId',
@@ -73,25 +64,27 @@
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',
- headerName: translate('table.field.asnOrderItem.anfme')
+ headerName: translate('table.field.asnOrderItem.purQty')
},
{
field: 'stockUnit',
headerName: translate('table.field.asnOrderItem.stockUnit')
},
- {
- field: 'purQty',
- headerName: translate('table.field.asnOrderItem.purQty')
- },
+ // {
+ // field: 'purQty',
+ // headerName: translate('table.field.asnOrderItem.purQty')
+ // },
{
field: 'purUnit',
headerName: translate('table.field.asnOrderItem.purUnit')
@@ -99,6 +92,10 @@
{
field: 'qty',
headerName: translate('table.field.asnOrderItem.qty')
+ },
+ {
+ field: 'splrBatch',
+ headerName: translate('table.field.asnOrderItem.splrBatch')
},
{
field: 'splrCode',
@@ -110,7 +107,12 @@
},
{
field: 'trackCode',
- headerName: translate('table.field.asnOrderItem.barcode')
+ headerName: translate('table.field.asnOrderItem.barcode'),
+ width: 150
+ },
+ {
+ field: 'prodTime',
+ headerName: translate('table.field.asnOrderItem.prodTime')
},
{
field: 'packName',
@@ -146,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