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

skyouc

2025-04-17 b30e2878e41607fb7fb8168e3b5b61948d7c359a

 rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogEdit.jsx

@@ -29,7 +29,7 @@
const FormToolbar = () => {
    return (
        <Toolbar sx={{ justifyContent: 'end' }}>
            <SaveButton />
           <></>
        </Toolbar>
    )
}
@@ -54,12 +54,23 @@
                // validate={(values) => { }}
                >
                    <Grid container width={{ xs: '100%', xl: '80%' }} rowSpacing={3} columnSpacing={3}>
                        <Grid item xs={24} md={12}>
                        <Grid item xs={24} md={12} 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)"                            
                            } 
                        }}>
                            <Typography variant="h6" gutterBottom>
                                {translate('common.edit.title.main')}
                            </Typography>
                            <Stack direction='row' gap={2}>
                                <TextInput
                                disableUnderline 
                                    label="table.field.asnOrderLog.code"
                                    source="code"
                                    parse={v => v}
@@ -78,14 +89,14 @@
                                />
                                <TextInput
                                    label="table.field.asnOrderLog.type"
                                    source="type"
                                    source="type$"
                                    readOnly
                                    parse={v => v}
                                    validate={required()}
                                />
                                <TextInput
                                    label="table.field.asnOrderLog.wkType"
                                    source="wkType"
                                    source="wkType$"
                                    readOnly
                                    parse={v => v}
                                    validate={required()}