From f34089d1d321efe55c98e6f2638d924ae515effd Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 06 八月 2025 14:09:18 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/stockManage/locRevise/LocReviseEdit.jsx | 163 ++++++++++++++++++++++++++++-------------------------
1 files changed, 86 insertions(+), 77 deletions(-)
diff --git a/rsf-admin/src/page/stockManage/locRevise/LocReviseEdit.jsx b/rsf-admin/src/page/stockManage/locRevise/LocReviseEdit.jsx
index 80db4ee..71ba80d 100644
--- a/rsf-admin/src/page/stockManage/locRevise/LocReviseEdit.jsx
+++ b/rsf-admin/src/page/stockManage/locRevise/LocReviseEdit.jsx
@@ -28,91 +28,100 @@
import CustomerTopToolBar from "@/page/components/EditTopToolBar";
import MemoInput from "@/page/components/MemoInput";
import StatusSelectInput from "@/page/components/StatusSelectInput";
+import ReviseLogList from "./ReviseLogList";
const LocReviseEdit = () => {
const translate = useTranslate();
+ const [disabled, setDisabled] = useState(false);
+
+ const FormToolbar = () => {
+ return (
+ <Toolbar sx={{ justifyContent: 'flex-end' }}>
+ <SaveButton disabled={disabled} />
+ <DeleteButton mutationMode="optimistic" />
+ </Toolbar>
+ )
+ }
return (
- <Edit
- redirect="list"
- mutationMode={EDIT_MODE}
- actions={<CustomerTopToolBar />}
- aside={<EditBaseAside />}
- >
- <SimpleForm
- shouldUnregister
- warnWhenUnsavedChanges
- toolbar={false}
- mode="onTouched"
- defaultValues={{}}
- sx={{
- "& .MuiFormLabel-root.MuiInputLabel-root.Mui-disabled": {
- bgcolor: 'white',
- WebkitTextFillColor: "rgba(0, 0, 0)"
- },
-
- "& .MuiInputBase-input.MuiFilledInput-input.Mui-disabled": {
- bgcolor: 'white',
- WebkitTextFillColor: "rgba(0, 0, 0)"
- }
- }}
- // 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={24} md={12}>
- <Typography variant="h6" gutterBottom>
- {translate('common.edit.title.main')}
- </Typography>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.locRevise.code"
- source="code"
- parse={v => v}
- readOnly
- />
- <SelectInput
- label="table.field.locRevise.type"
- source="type"
- choices={[
- { id: 0, name: ' 搴撳瓨璋冩暣' },
- { id: 2, name: ' 鐩樼偣璋冩暣' },
- ]}
- readOnly
- />
- <NumberInput
- label="table.field.locRevise.anfme"
- source="anfme"
- readOnly
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.locRevise.reviseQty"
- source="reviseQty"
- readOnly
- />
- <SelectInput
- label="table.field.locRevise.exceStatus"
- source="exceStatus"
- choices={[
- { id: 0, name: '鏈墽琛�' },
- { id: 1, name: '鎵ц涓�' },
- { id: 2, name: '鎵ц瀹屾垚' },
- ]}
- readOnly
- />
- <TextInput
- label="table.field.locRevise.areaName"
- source="orgAreaName"
- parse={v => v}
- readOnly
- />
- </Stack>
+ <SimpleForm
+ shouldUnregister
+ warnWhenUnsavedChanges
+ toolbar={<FormToolbar />}
+ mode="onTouched"
+ defaultValues={{}}
+ // sx={{
+ // "& .MuiFormLabel-root.MuiInputLabel-root.Mui-disabled": {
+ // bgcolor: 'white',
+ // WebkitTextFillColor: "rgba(0, 0, 0)"
+ // },
+
+ // "& .MuiInputBase-input.MuiFilledInput-input.Mui-disabled": {
+ // bgcolor: 'white',
+ // WebkitTextFillColor: "rgba(0, 0, 0)"
+ // }
+ // }}
+ validate={(values) => { }}
+ >
+ <Grid container width={{ xs: '100%', xl: '80%' }} rowSpacing={3} columnSpacing={3}>
+ <Grid item xs={24} md={12}>
+ <Typography variant="h6" gutterBottom>
+ {translate('common.edit.title.main')}
+ </Typography>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.locRevise.code"
+ source="code"
+ parse={v => v}
+ readOnly
+ />
+ <SelectInput
+ label="table.field.locRevise.type"
+ source="type"
+ choices={[
+ { id: 0, name: ' 搴撳瓨璋冩暣' },
+ { id: 2, name: ' 鐩樼偣璋冩暣' },
+ ]}
+ />
+ <NumberInput
+ label="table.field.locRevise.anfme"
+ source="anfme"
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.locRevise.reviseQty"
+ source="reviseQty"
+ />
+ <SelectInput
+ label="table.field.locRevise.exceStatus"
+ source="exceStatus"
+ choices={[
+ { id: 0, name: '鏈墽琛�' },
+ { id: 1, name: '鎵ц涓�' },
+ { id: 2, name: '鎵ц瀹屾垚' },
+ ]}
+ />
+ <TextInput
+ label="table.field.locRevise.areaName"
+ source="orgAreaName"
+ parse={v => v}
+ />
+ </Stack>
+ </Grid>
</Grid>
- </Grid>
- </SimpleForm>
- </Edit >
+ </SimpleForm>
+ </Edit >
+ <ReviseLogList />
+ </>
)
}
--
Gitblit v1.9.1