From d3c44bb9a25c42bba6e2dfd85ac7d04863112dc8 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 30 四月 2025 10:48:38 +0800 Subject: [PATCH] 收货单改入修改 单位带入修改 --- rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx b/rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx index 8f3788b..770ef8b 100644 --- a/rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx +++ b/rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx @@ -55,16 +55,18 @@ const hasarr = data.map(el => +el.matnrId) const selectedData = selectedRows.filter(item => !hasarr.includes(item)).map(id => (tableData.find(row => row.id === id))); const value = selectedData.map((el => { + console.log(el); const dynamicFields = dyFields.reduce((acc, item) => { acc[item.fields] = el['extendFields']?.[item.fields] || ''; return acc; }, {}); return { + ...el, matnrId: el.id, maktx: el.name, matnrCode: el.code, - stockUnit: el.stockUnit || '', - purUnit: el.purchaseUnit || '', + stockUnit: el.unit, + purUnit: el.unit, ...dynamicFields } })) @@ -176,11 +178,9 @@ }; export default AsnWareModal; - const AsnWareModalTable = ({ tableData, setTableData, selectedRows, setSelectedRows, dyFields, setDyFields }) => { const translate = useTranslate(); const notify = useNotify(); - const [columns, setColumns] = useState([ // { field: 'id', headerName: 'ID', width: 100 }, { field: 'name', headerName: translate('table.field.matnr.name'), width: 300 }, @@ -189,20 +189,16 @@ { field: 'spec', headerName: translate('table.field.matnr.spec'), width: 100 }, { field: 'model', headerName: translate('table.field.matnr.model'), width: 100 }, { field: 'weight', headerName: translate('table.field.matnr.weight'), width: 100 }, - { field: 'describle', headerName: translate('table.field.matnr.describle'), width: 100 }, { field: 'nromNum', headerName: translate('table.field.matnr.nromNum'), width: 100 }, { field: 'unit', headerName: translate('table.field.matnr.unit'), width: 100 }, - { field: 'purchaseUnit', headerName: translate('table.field.matnr.purUnit'), width: 100 }, + { field: 'purUnit', headerName: translate('table.field.matnr.purUnit'), width: 100 }, { field: 'stockUnit', headerName: translate('table.field.matnr.stockUnit'), width: 100 }, { field: 'stockLeval$', headerName: translate('table.field.matnr.stockLevel'), width: 100, sortable: false }, ]) - - const handleSelectionChange = (ids) => { setSelectedRows(ids) - }; useEffect(() => { -- Gitblit v1.9.1