From 660fac2458932a36b0c113861423afec9930dc1b Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期六, 22 三月 2025 09:15:17 +0800 Subject: [PATCH] Merge branch 'front' of http://47.97.1.152:5880/r/wms-master into front --- rsf-admin/src/page/basicInfo/loc/LocList.jsx | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/rsf-admin/src/page/basicInfo/loc/LocList.jsx b/rsf-admin/src/page/basicInfo/loc/LocList.jsx index dda2264..d07243d 100644 --- a/rsf-admin/src/page/basicInfo/loc/LocList.jsx +++ b/rsf-admin/src/page/basicInfo/loc/LocList.jsx @@ -54,6 +54,7 @@ import EditIcon from '@mui/icons-material/Edit'; import request from '@/utils/request'; import DiscountIcon from '@mui/icons-material/Discount'; +import { textAlign } from "@mui/system"; const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({ '& .css-1vooibu-MuiSvgIcon-root': { @@ -67,6 +68,9 @@ '& .opt': { width: 200 }, + '& .RaDatagrid-headerCell': { + textAlign: 'left' + } })); const filters = [ @@ -140,6 +144,7 @@ > <StyledDatagrid preferenceKey='loc' + align="left" bulkActionButtons={ <> <BatchButton /> @@ -152,9 +157,9 @@ > <NumberField source="id" /> <NumberField source="warehouseId$" label="table.field.loc.warehouseId" /> - <NumberField source="areaId$" label="table.field.loc.areaId" /> - <TextField source="code" label="table.field.loc.code" /> - <TextField source="typeIds$" label="table.field.loc.type" /> + <NumberField source="areaId$" label="table.field.loc.areaId" align="left" /> + <TextField source="code" label="table.field.loc.code" align="left" /> + <TextField source="typeIds$" label="table.field.loc.type" align="left" /> {/* <TextField source="name" label="table.field.loc.name" /> */} {/* <NumberField source="flagLogic" label="table.field.loc.flagLogic" /> <TextField source="fucAtrrs" label="table.field.loc.fucAtrrs" /> @@ -175,12 +180,12 @@ <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}> <TextField source="nickname" /> </ReferenceField> - <DateField source="updateTime" label="common.field.updateTime" showTime /> - <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}> + <DateField source="updateTime" label="common.field.updateTime" showTime align="left" /> + <ReferenceField source="createBy" label="common.field.createBy" align="left" reference="user" link={false} sortable={false}> <TextField source="nickname" /> </ReferenceField> - <DateField source="createTime" label="common.field.createTime" showTime /> - <BooleanField source="statusBool" label="common.field.status" sortable={false} /> + <DateField source="createTime" label="common.field.createTime" showTime align="left" /> + <BooleanField source="statusBool" label="common.field.status" sortable={false} align="left" /> <TextField source="memo" label="common.field.memo" sortable={false} /> <WrapperField cellClassName="opt" label="common.field.opt"> -- Gitblit v1.9.1