From a6991a33e18f69264f93a63459a4b64ea799295a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 05 八月 2025 13:02:24 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/asnOrder/AsnOrderPanel.jsx | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderPanel.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderPanel.jsx
index 4649e7f..1353f3b 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderPanel.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderPanel.jsx
@@ -29,7 +29,7 @@
}, [asnId, maktx]);
const http = async (parmas) => {
- const res = await request.post('/asnOrderItem/page', { ...parmas, asnId });
+ const res = await request.post('/asnOrderItem/page', { ...parmas, orderId: asnId });
if (res?.data?.code === 200) {
setRows(res.data.data.records)
} else {
@@ -47,12 +47,12 @@
const columns = [
{
- field: 'asnId',
- headerName: translate('table.field.asnOrderItem.asnId')
+ field: 'orderId',
+ headerName: translate('table.field.asnOrderItem.orderId')
},
{
- field: 'asnCode',
- headerName: translate('table.field.asnOrderItem.asnCode'),
+ field: 'orderCode',
+ headerName: translate('table.field.asnOrderItem.orderCode'),
width: 150,
},
// {
@@ -175,7 +175,7 @@
},
},
}}
- pageSizeOptions={[10, 25, 50]}
+ pageSizeOptions={[15, 25, 50]}
/>
</Box >
--
Gitblit v1.9.1