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/asnOrderLog/AsnOrderLogPanel.jsx | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/page/asnOrderLog/AsnOrderLogPanel.jsx b/rsf-admin/src/page/asnOrderLog/AsnOrderLogPanel.jsx
index 347e38e..1058e9d 100644
--- a/rsf-admin/src/page/asnOrderLog/AsnOrderLogPanel.jsx
+++ b/rsf-admin/src/page/asnOrderLog/AsnOrderLogPanel.jsx
@@ -21,7 +21,7 @@
const notify = useNotify();
const [rows, setRows] = useState([]);
const [maktx, setMaktx] = useState('');
- const asnId = record.id;
+ const asnId = record.asnId;
useEffect(() => {
debouncedHttp({ maktx });
@@ -81,6 +81,10 @@
headerName: translate('table.field.asnOrderItemLog.qty')
},
{
+ field: 'splrBatch',
+ headerName: translate('table.field.asnOrderItem.splrBatch')
+ },
+ {
field: 'splrCode',
headerName: translate('table.field.asnOrderItemLog.splrCode')
},
@@ -91,6 +95,10 @@
{
field: 'trackCode',
headerName: translate('table.field.asnOrderItemLog.barcode')
+ },
+ {
+ field: 'prodTime',
+ headerName: translate('table.field.asnOrderItem.prodTime')
},
{
field: 'packName',
@@ -112,7 +120,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' }}>
</div>
--
Gitblit v1.9.1