From 2d5ffc17e5d76a468493b21c45df1ca547b10da3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 13:40:17 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/asnOrder/AsnOrderItemEdit.jsx | 81 +++++++++++++++++++++-------------------
1 files changed, 43 insertions(+), 38 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemEdit.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemEdit.jsx
index 07570e0..123f364 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemEdit.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemEdit.jsx
@@ -22,6 +22,7 @@
useGetOne,
DeleteButton,
EditBase,
+ ReferenceField,
} from 'react-admin';
import { useWatch, useFormContext } from "react-hook-form";
import { Stack, Grid, Box, Typography, Dialog, DialogActions, DialogContent, DialogTitle } from '@mui/material';
@@ -55,33 +56,33 @@
if (data == null || data == undefined) { return }
return (
- <EditBase
- id={record?.id}
- resource="asnOrderItem"
- mutationMode={EDIT_MODE}
- actions={<CustomerTopToolBar />}
+ <Dialog
+ open={open}
+ onClose={handleClose}
+ aria-labelledby="form-dialog-title"
+ fullWidth
+ disableRestoreFocus
+ maxWidth="md"
>
- <Dialog
- open={open}
- onClose={handleClose}
- aria-labelledby="form-dialog-title"
- fullWidth
- disableRestoreFocus
- maxWidth="md"
+ <DialogTitle id="form-dialog-title" sx={{
+ position: 'sticky',
+ top: 0,
+ backgroundColor: 'background.paper',
+ zIndex: 1000
+ }}
>
- <DialogTitle id="form-dialog-title" sx={{
- position: 'sticky',
- top: 0,
- backgroundColor: 'background.paper',
- zIndex: 1000
- }}
+ {translate('update.title')}
+ <Box sx={{ position: 'absolute', top: 8, right: 8, zIndex: 1001 }}>
+ <DialogCloseButton onClose={handleClose} />
+ </Box>
+ </DialogTitle>
+ <DialogContent sx={{ mt: 2 }}>
+ <EditBase
+ id={record?.id}
+ resource="asnOrderItem"
+ mutationMode={EDIT_MODE}
+ actions={<CustomerTopToolBar />}
>
- {translate('update.title')}
- <Box sx={{ position: 'absolute', top: 8, right: 8, zIndex: 1001 }}>
- <DialogCloseButton onClose={handleClose} />
- </Box>
- </DialogTitle>
- <DialogContent sx={{ mt: 2 }}>
<Form
shouldUnregister
warnWhenUnsavedChanges
@@ -118,11 +119,20 @@
label="table.field.asnOrderItem.matnrId"
source="matnrId"
parse={v => v}
+ readOnly
/>
+ <TextInput
+ label="table.field.asnOrderItem.matnrCode"
+ source="matnrCode"
+ parse={v => v}
+ readOnly
+ />
+
<TextInput
label="table.field.asnOrderItem.maktx"
source="maktx"
parse={v => v}
+ readOnly
/>
<NumberInput
label="table.field.asnOrderItem.anfme"
@@ -149,19 +159,13 @@
<NumberInput
label="table.field.asnOrderItem.qty"
source="qty"
+ readOnly
/>
- <TextInput
- label="table.field.asnOrderItem.splrCode"
- source="splrCode"
- parse={v => v}
- />
+ <ReferenceInput source="splrName" label="table.field.asnOrderItem.splrName" reference="companys" filter={{type: 'supplier'}}>
+ <AutocompleteInput optionText="name" label="table.field.asnOrderItem.splrName" />
+ </ReferenceInput>
</Stack>
<Stack direction='row' gap={2}>
- <TextInput
- label="table.field.asnOrderItem.splrName"
- source="splrName"
- parse={v => v}
- />
<TextInput
label="table.field.asnOrderItem.qrcode"
source="qrcode"
@@ -169,8 +173,9 @@
/>
<TextInput
label="table.field.asnOrderItem.barcode"
- source="barcode"
+ source="trackCode"
parse={v => v}
+ readOnly
/>
<TextInput
label="table.field.asnOrderItem.packName"
@@ -190,9 +195,9 @@
</Toolbar>
</DialogActions>
</Form>
- </DialogContent>
- </Dialog>
- </EditBase >
+ </EditBase >
+ </DialogContent>
+ </Dialog>
)
}
--
Gitblit v1.9.1