From b778c28b598eecd0687f0612f9236c6e957de89f Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期四, 03 四月 2025 16:59:34 +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 | 105 +++++++++++++++++++++++++---------------------------
1 files changed, 50 insertions(+), 55 deletions(-)
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
index e75c230..3f6b568 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
@@ -57,11 +57,12 @@
import DictSelect from "../components/DictSelect";
const AsnOrderModal = (props) => {
- const { open, setOpen, asnId } = props;
+ const { open, setOpen, asnId, billReload } = props;
const translate = useTranslate();
const notify = useNotify();
const refresh = useRefresh();
+ const [disabled, setDisabled] = useState(false)
const [createDialog, setCreateDialog] = useState(false);
@@ -97,6 +98,7 @@
};
const handleSubmit = async () => {
+ setDisabled(true)
if (asnId === 0) {
const parmas = {
"orders": formData,
@@ -106,6 +108,7 @@
const res = await request.post(`/asnOrder/items/save`, parmas);
if (res?.data?.code === 200) {
setOpen(false);
+ billReload()
refresh();
} else {
notify(res.data.msg);
@@ -119,11 +122,12 @@
if (res?.data?.code === 200) {
setOpen(false);
refresh();
+
} else {
notify(res.data.msg);
}
}
-
+ setDisabled(false)
};
@@ -229,7 +233,7 @@
</DialogContent>
<DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
<Toolbar sx={{ width: '100%', justifyContent: 'space-between' }} >
- <Button onClick={handleSubmit} variant="contained" startIcon={<SaveIcon />}>
+ <Button disabled={disabled} onClick={handleSubmit} variant="contained" startIcon={<SaveIcon />}>
{translate('toolbar.confirm')}
</Button>
</Toolbar>
@@ -256,37 +260,16 @@
const [columns, setColumns] = useState([
{
- field: 'matnrId',
- headerName: translate('table.field.asnOrderItem.matnrId'),
- minWidth: 100,
- flex: 1,
+ field: 'maktx',
+ headerName: translate('table.field.asnOrderItem.maktx'),
+ width: 250,
editable: false,
},
{
- field: 'maktx',
- headerName: translate('table.field.asnOrderItem.maktx'),
- minWidth: 100,
- flex: 1,
- editable: true,
- },
- {
- 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,
+ field: 'matnrCode',
+ headerName: translate('table.field.asnOrderItem.matnrCode'),
+ width: 130,
+ editable: false,
},
{
field: 'anfme',
@@ -295,6 +278,40 @@
flex: 1,
editable: true,
},
+ {
+ field: 'splrCode',
+ headerName: translate('table.field.asnOrderItem.splrCode'),
+ minWidth: 100,
+ flex: 1,
+ editable: true,
+ },
+ {
+ field: 'splrName',
+ headerName: translate('table.field.asnOrderItem.splrName'),
+ minWidth: 100,
+ flex: 1,
+ editable: true,
+ },
+ // {
+ // field: 'packName',
+ // headerName: translate('table.field.asnOrderItem.packName'),
+ // minWidth: 100,
+ // flex: 1,
+ // editable: true,
+ // },
+ // {
+ // field: 'poDetlId',
+ // headerName: translate('table.field.asnOrderItem.poDetlId'),
+ // minWidth: 100,
+ // flex: 1,
+ // },
+ {
+ field: 'platItemId',
+ headerName: translate('table.field.asnOrderItem.platItemId'),
+ minWidth: 100,
+ flex: 1,
+ },
+
{
field: 'stockUnit',
headerName: translate('table.field.asnOrderItem.stockUnit'),
@@ -316,27 +333,7 @@
flex: 1,
editable: false,
},
- {
- field: 'splrCode',
- headerName: translate('table.field.asnOrderItem.splrCode'),
- minWidth: 100,
- flex: 1,
- editable: true,
- },
- {
- field: 'splrName',
- headerName: translate('table.field.asnOrderItem.splrName'),
- minWidth: 100,
- flex: 1,
- editable: true,
- },
- {
- field: 'packName',
- headerName: translate('table.field.asnOrderItem.packName'),
- minWidth: 100,
- flex: 1,
- editable: true,
- },
+
])
@@ -378,7 +375,7 @@
headerName: el.fieldsAlise,
minWidth: 100,
flex: 1,
- editable: true
+ editable: false
}))
setColumns([...columns, ...cols, action])
} else {
@@ -410,8 +407,6 @@
setSelectedRows(ids)
};
-
-
return (
<div style={{ height: 400, width: '100%' }}>
--
Gitblit v1.9.1