From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 16:35:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/asnOrder/POItemModal.jsx | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/POItemModal.jsx b/rsf-admin/src/page/orders/asnOrder/POItemModal.jsx
index 4bd0981..471a4f1 100644
--- a/rsf-admin/src/page/orders/asnOrder/POItemModal.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/POItemModal.jsx
@@ -109,8 +109,6 @@
"purchaseId": record,
"items": tabelData,
}
- console.log('--------->');
- console.log(parmas);
const res = await request.post(`/asnOrder/purchases/save`, parmas);
if (res?.data?.code === 200) {
notify(res.data.msg);
@@ -167,7 +165,7 @@
</Box>
</DialogContent>
<DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
- <Toolbar sx={{ width: '100%', justifyContent: 'space-between' }} >
+ <Toolbar sx={{ width: '100%', justifyContent: 'end' }} >
<Button disabled={disabled} onClick={handleSubmit} variant="contained" startIcon={<SaveIcon />}>
{translate('toolbar.confirm')}
</Button>
@@ -283,6 +281,14 @@
headerClassName: "custom",
},
{
+ field: 'qty',
+ headerName: translate('table.field.asnOrderItem.qty') + "*",
+ type: 'number',
+ minWidth: 100,
+ flex: 1,
+ valueFormatter: (val) => val < 0 ? 0 : val,
+ },
+ {
field: 'unit',
headerName: translate('table.field.asnOrderItem.stockUnit'),
minWidth: 100,
@@ -388,7 +394,7 @@
},
},
}}
- pageSizeOptions={[10, 25, 50, 100]}
+ pageSizeOptions={[15, 25, 50, 100]}
editMode="row"
checkboxSelection
onRowSelectionModelChange={handleSelectionChange}
--
Gitblit v1.9.1