From b042540b20c3b7d377b2ab33a97f9de4d498c7ae Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 31 三月 2025 12:42:25 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/asnOrder/AsnOrderModal.jsx | 83 +++++++++++++++++++----------------------
1 files changed, 38 insertions(+), 45 deletions(-)
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
index e75c230..4b48363 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
@@ -256,37 +256,18 @@
const [columns, setColumns] = useState([
{
- field: 'matnrId',
- headerName: translate('table.field.asnOrderItem.matnrId'),
- minWidth: 100,
- flex: 1,
- editable: false,
- },
- {
field: 'maktx',
headerName: translate('table.field.asnOrderItem.maktx'),
minWidth: 100,
flex: 1,
- editable: true,
+ editable: false,
},
{
field: 'maktxCode',
headerName: translate('table.field.asnOrderItem.maktxCode'),
minWidth: 100,
flex: 1,
- editable: true,
- },
- {
- field: 'poDetlId',
- headerName: translate('table.field.asnOrderItem.poDetlId'),
- minWidth: 100,
- flex: 1,
- },
- {
- field: 'poDetlCode',
- headerName: translate('table.field.asnOrderItem.poDetlCode'),
- minWidth: 100,
- flex: 1,
+ editable: false,
},
{
field: 'anfme',
@@ -294,27 +275,6 @@
minWidth: 100,
flex: 1,
editable: true,
- },
- {
- field: 'stockUnit',
- headerName: translate('table.field.asnOrderItem.stockUnit'),
- minWidth: 100,
- flex: 1,
- editable: false,
- },
- // {
- // field: 'purQty',
- // headerName: translate('table.field.asnOrderItem.purQty'),
- // minWidth: 100,
- // flex: 1,
- // editable: true,
- // },
- {
- field: 'purUnit',
- headerName: translate('table.field.asnOrderItem.purUnit'),
- minWidth: 100,
- flex: 1,
- editable: false,
},
{
field: 'splrCode',
@@ -337,6 +297,41 @@
flex: 1,
editable: true,
},
+ {
+ field: 'poDetlId',
+ headerName: translate('table.field.asnOrderItem.poDetlId'),
+ minWidth: 100,
+ flex: 1,
+ },
+ {
+ field: 'poDetlCode',
+ headerName: translate('table.field.asnOrderItem.poDetlCode'),
+ minWidth: 100,
+ flex: 1,
+ },
+
+ {
+ field: 'stockUnit',
+ headerName: translate('table.field.asnOrderItem.stockUnit'),
+ minWidth: 100,
+ flex: 1,
+ editable: false,
+ },
+ // {
+ // field: 'purQty',
+ // headerName: translate('table.field.asnOrderItem.purQty'),
+ // minWidth: 100,
+ // flex: 1,
+ // editable: true,
+ // },
+ {
+ field: 'purUnit',
+ headerName: translate('table.field.asnOrderItem.purUnit'),
+ minWidth: 100,
+ flex: 1,
+ editable: false,
+ },
+
])
@@ -378,7 +373,7 @@
headerName: el.fieldsAlise,
minWidth: 100,
flex: 1,
- editable: true
+ editable: false
}))
setColumns([...columns, ...cols, action])
} else {
@@ -410,8 +405,6 @@
setSelectedRows(ids)
};
-
-
return (
<div style={{ height: 400, width: '100%' }}>
--
Gitblit v1.9.1