From 1c502c82c188292fd8c9337c221e1f09a86a642b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 15 八月 2025 13:34:03 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/task/TaskEdit.jsx | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/rsf-admin/src/page/task/TaskEdit.jsx b/rsf-admin/src/page/task/TaskEdit.jsx
index bca87b3..e9686fe 100644
--- a/rsf-admin/src/page/task/TaskEdit.jsx
+++ b/rsf-admin/src/page/task/TaskEdit.jsx
@@ -20,7 +20,8 @@
const { getValues } = useFormContext();
return (
<Toolbar sx={{ justifyContent: 'end' }}>
- <SaveButton />
+ <></>
+ {/* <SaveButton /> */}
{/* <DeleteButton mutationMode="optimistic" /> */}
</Toolbar>
)
@@ -39,9 +40,20 @@
<SimpleForm
shouldUnregister
warnWhenUnsavedChanges
- toolbar={<FormToolbar />}
+ 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)"
+ }
+ }}
>
<Grid container width={{ xs: '100%', xl: '80%' }} rowSpacing={3} columnSpacing={3}>
<Grid item xs={24} md={16}>
@@ -101,20 +113,19 @@
<NumberInput
label="table.field.task.sort"
source="sort"
+ readOnly
/>
</Stack>
</Grid>
</Grid>
</SimpleForm>
</Edit >
- <Card sx={{ marginTop: '1em', }}>
- <Grid item xs={24} md={16} sx={{ margin: '1em' }}>
- <Typography variant="h6" gutterBottom >
- {translate('common.edit.title.common')}
- </Typography>
- <TaskItemList />
- </Grid>
- </Card>
+ <Grid item xs={24} md={16} sx={{ margin: '1em', height: 'auto' }}>
+ <Typography variant="h6" gutterBottom >
+ {translate('common.edit.title.common')}
+ </Typography>
+ </Grid>
+ <TaskItemList />
</>
)
}
--
Gitblit v1.9.1