Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-05-20 843d5b6dd50567dadcc56257f074840e80d757aa

 rsf-admin/src/page/histories/taskLog/TaskLogEdit.jsx

@@ -20,7 +20,8 @@
    const { getValues } = useFormContext();
    return (
        <Toolbar sx={{ justifyContent: 'end' }}>
            <SaveButton />
            <></>
            {/* <SaveButton /> */}
            {/* <DeleteButton mutationMode="optimistic" /> */}
        </Toolbar>
    )
@@ -42,6 +43,17 @@
                    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)"
                        }
                    }}
                >
                    <Grid container width={{ xs: '100%', xl: '80%' }} rowSpacing={3} columnSpacing={3}>
                        <Grid item xs={24} md={16}>