From c8fde8647b48e7c7d9b3beb6e8c39459f07c9eb2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 14:55:46 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/locItem/LocItemEdit.jsx | 48 ++++++++++++++++++++----------------------------
1 files changed, 20 insertions(+), 28 deletions(-)
diff --git a/rsf-admin/src/page/locItem/LocItemEdit.jsx b/rsf-admin/src/page/locItem/LocItemEdit.jsx
index c9eb84a..120f850 100644
--- a/rsf-admin/src/page/locItem/LocItemEdit.jsx
+++ b/rsf-admin/src/page/locItem/LocItemEdit.jsx
@@ -33,9 +33,9 @@
const { getValues } = useFormContext();
return (
- <Toolbar sx={{ justifyContent: 'space-between' }}>
+ <Toolbar sx={{ justifyContent: 'end' }}>
<SaveButton />
- <DeleteButton mutationMode="optimistic" />
+ {/* <DeleteButton mutationMode="optimistic" /> */}
</Toolbar>
)
}
@@ -58,8 +58,8 @@
defaultValues={{}}
// validate={(values) => { }}
>
- <Grid container width={{ xs: '100%', xl: '80%' }} rowSpacing={3} columnSpacing={3}>
- <Grid item xs={12} md={8}>
+ <Grid container width={{ xs: '100%', xl: '100%' }} rowSpacing={3} columnSpacing={3}>
+ <Grid item xs={14} md={10}>
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.main')}
</Typography>
@@ -69,17 +69,18 @@
source="locId"
autoFocus
/>
- </Stack>
- <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.locItem.locCode"
+ source="locCode"
+ parse={v => v}
+ />
<NumberInput
label="table.field.locItem.orderId"
source="orderId"
/>
- </Stack>
- <Stack direction='row' gap={2}>
<TextInput
label="table.field.locItem.type"
- source="type"
+ source="type$"
parse={v => v}
/>
</Stack>
@@ -88,14 +89,10 @@
label="table.field.locItem.orderItemId"
source="orderItemId"
/>
- </Stack>
- <Stack direction='row' gap={2}>
<NumberInput
label="table.field.locItem.wkType"
source="wkType"
/>
- </Stack>
- <Stack direction='row' gap={2}>
<NumberInput
label="table.field.locItem.matnrId"
source="matnrId"
@@ -107,22 +104,17 @@
source="maktx"
parse={v => v}
/>
- </Stack>
- <Stack direction='row' gap={2}>
+
<TextInput
label="table.field.locItem.matnrCode"
source="matnrCode"
parse={v => v}
/>
- </Stack>
- <Stack direction='row' gap={2}>
<TextInput
label="table.field.locItem.trackCode"
source="trackCode"
parse={v => v}
/>
- </Stack>
- <Stack direction='row' gap={2}>
<TextInput
label="table.field.locItem.unit"
source="unit"
@@ -134,8 +126,14 @@
label="table.field.locItem.anfme"
source="anfme"
/>
- </Stack>
- <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.locItem.qty"
+ source="qty"
+ />
+ <NumberInput
+ label="table.field.locItem.workQty"
+ source="workQty"
+ />
<TextInput
label="table.field.locItem.batch"
source="batch"
@@ -148,22 +146,16 @@
source="splrBatch"
parse={v => v}
/>
- </Stack>
- <Stack direction='row' gap={2}>
<TextInput
label="table.field.locItem.spec"
source="spec"
parse={v => v}
/>
- </Stack>
- <Stack direction='row' gap={2}>
<TextInput
label="table.field.locItem.model"
source="model"
parse={v => v}
/>
- </Stack>
- <Stack direction='row' gap={2}>
<TextInput
label="table.field.locItem.fieldsIndex"
source="fieldsIndex"
@@ -172,7 +164,7 @@
</Stack>
</Grid>
- <Grid item xs={12} md={4}>
+ <Grid item xs={10} md={2}>
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.common')}
</Typography>
--
Gitblit v1.9.1