From 141f60bd32ea2027665a0495b6d9f538e8b7dad0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 四月 2025 14:19:04 +0800
Subject: [PATCH] #修改 1. 修改收货单历史档显示 2. 修改采购PO单显示问题
---
rsf-admin/src/page/purchase/PurchaseEdit.jsx | 203 +++++++++++++++++++++++---------------------------
1 files changed, 95 insertions(+), 108 deletions(-)
diff --git a/rsf-admin/src/page/purchase/PurchaseEdit.jsx b/rsf-admin/src/page/purchase/PurchaseEdit.jsx
index 08cb3aa..93bb094 100644
--- a/rsf-admin/src/page/purchase/PurchaseEdit.jsx
+++ b/rsf-admin/src/page/purchase/PurchaseEdit.jsx
@@ -28,12 +28,13 @@
import CustomerTopToolBar from "../components/EditTopToolBar";
import MemoInput from "../components/MemoInput";
import StatusSelectInput from "../components/StatusSelectInput";
+import PurchaseItemList from "./PurchaseItemList";
const FormToolbar = () => {
const { getValues } = useFormContext();
return (
- <Toolbar sx={{ justifyContent: 'space-between' }}>
+ <Toolbar sx={{ justifyContent: 'end' }}>
<SaveButton />
<DeleteButton mutationMode="optimistic" />
</Toolbar>
@@ -44,122 +45,108 @@
const translate = useTranslate();
return (
- <Edit
- redirect="list"
- mutationMode={EDIT_MODE}
- actions={<CustomerTopToolBar />}
- aside={<EditBaseAside />}
- >
- <SimpleForm
- shouldUnregister
- warnWhenUnsavedChanges
- toolbar={<FormToolbar />}
- mode="onTouched"
- defaultValues={{}}
- // validate={(values) => { }}
+ <>
+ <Edit
+ redirect="list"
+ mutationMode={EDIT_MODE}
+ actions={<CustomerTopToolBar />}
+ aside={<EditBaseAside />}
>
- <Grid container width={{ xs: '100%', xl: '80%' }} rowSpacing={3} columnSpacing={3}>
- <Grid item xs={12} md={8}>
- <Typography variant="h6" gutterBottom>
- {translate('common.edit.title.main')}
- </Typography>
- <Stack direction='row' gap={2}>
+ <SimpleForm
+ shouldUnregister
+ warnWhenUnsavedChanges
+ toolbar={<FormToolbar />}
+ mode="onTouched"
+ defaultValues={{}}
+ // validate={(values) => { }}
+ >
+ <Grid container width={{ xs: '100%', xl: '80%' }} rowSpacing={3} columnSpacing={3}>
+ <Grid item xs={18} md={10}>
+ <Typography variant="h6" gutterBottom>
+ {translate('common.edit.title.main')}
+ </Typography>
+ {/* <Stack direction='row' gap={2}>
<TextInput
label="table.field.purchase.code"
source="code"
parse={v => v}
autoFocus
/>
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.purchase.type"
- source="type"
- parse={v => v}
- validate={required()}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.purchase.from"
- source="from"
- parse={v => v}
- validate={required()}
- />
- </Stack>
- <Stack direction='row' gap={2}>
+ </Stack> */}
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.purchase.type"
+ source="type$"
+ parse={v => v}
+ validate={required()}
+ />
+ <TextInput
+ label="table.field.purchase.source"
+ source="source"
+ parse={v => v}
+ validate={required()}
+ />
+ <DateInput
+ label="table.field.purchase.preArr"
+ source="preArr"
+ />
+ <NumberInput
+ label="table.field.purchase.anfme"
+ source="anfme"
+ validate={required()}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.purchase.qty"
+ source="qty"
+ validate={required()}
+ />
+ <NumberInput
+ label="table.field.purchase.workQty"
+ source="workQty"
+ validate={required()}
+ />
+ <TextInput
+ label="table.field.purchase.channel"
+ source="channel"
+ parse={v => v}
+ />
+ <TextInput
+ label="table.field.purchase.platCode"
+ source="platCode"
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
<DateInput
- label="table.field.purchase.preArr"
- source="preArr"
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.purchase.anfme"
- source="anfme"
- validate={required()}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.purchase.qty"
- source="qty"
- validate={required()}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.purchase.workQty"
- source="workQty"
- validate={required()}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.purchase.channel"
- source="channel"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.purchase.erpCode"
- source="erpCode"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <DateInput
- label="table.field.purchase.startTime"
- source="startTime"
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <DateInput
- label="table.field.purchase.endTime"
- source="endTime"
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.purchase.project"
- source="project"
- parse={v => v}
- />
- </Stack>
-
+ label="table.field.purchase.startTime"
+ source="startTime"
+ />
+ <DateInput
+ label="table.field.purchase.endTime"
+ source="endTime"
+ />
+ <TextInput
+ label="table.field.purchase.project"
+ source="project"
+ parse={v => v}
+ />
+ </Stack>
+ </Grid>
+ <Grid item xs={6} md={2}>
+ <Typography variant="h6" gutterBottom>
+ {translate('common.edit.title.common')}
+ </Typography>
+ <StatusSelectInput />
+ <Box mt="2em" />
+ <MemoInput />
+ </Grid>
</Grid>
- <Grid item xs={12} md={4}>
- <Typography variant="h6" gutterBottom>
- {translate('common.edit.title.common')}
- </Typography>
- <StatusSelectInput />
- <Box mt="2em" />
- <MemoInput />
- </Grid>
- </Grid>
- </SimpleForm>
- </Edit >
+ </SimpleForm>
+ </Edit >
+ <PurchaseItemList />
+ </>
)
}
--
Gitblit v1.9.1