From 523d8cf68615134c7780f74933e70a14edb60f01 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 05 九月 2025 17:00:39 +0800
Subject: [PATCH] wcs联调功能优化
---
rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx | 59 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx b/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
index f82f9c9..7b02a1f 100644
--- a/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
+++ b/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
@@ -30,8 +30,8 @@
ReferenceInput,
ReferenceArrayInput,
AutocompleteInput,
- DeleteButton,
-
+ DeleteButton,
+
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -46,6 +46,7 @@
import * as Common from '@/utils/common';
import WarehouseAreaField from "./WarehouseAreaField";
import CrossZoneAreaField from "./CrossZoneAreaField";
+import ContainerTypesField from "./ContainerTypesField";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -63,10 +64,10 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
- <DateInput label='common.time.after' source="timeStart" alwaysOn />,
- <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
+ <DateInput label='common.time.after' source="timeStart" />,
+ <DateInput label='common.time.before' source="timeEnd" />,
- <TextInput source="stationName" label="table.field.basStation.stationName" />,
+ <TextInput source="stationName" label="table.field.basStation.stationName" alwaysOn />,
<NumberInput source="inAble" label="table.field.basStation.inAble" />,
<NumberInput source="outAble" label="table.field.basStation.outAble" />,
<TextInput source="useStatus" label="table.field.basStation.useStatus" />,
@@ -97,6 +98,7 @@
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
const [areaFieldDialog, setAreaFieldDialog] = useState(false);
+ const [areaFieldDialog2, setAreaFieldDialog2] = useState(false);
return (
<Box display="flex">
<List
@@ -125,24 +127,26 @@
<StyledDatagrid
preferenceKey='basStation'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
- rowClick={(id, resource, record) => false}
+ rowClick={(id, resource, record) => false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'updateBy', 'autoTransfer']}
>
<NumberField source="id" />
+ <TextField source="type$" label="table.field.basStation.type" />
<TextField source="stationName" label="table.field.basStation.stationName" />
+ <TextField source="useStatus$" label="table.field.basStation.useStatus" />
+ <TextField source="barcode" label="table.field.basStation.barcode" />
<FunctionField
source="inAble"
label="table.field.basStation.inAble"
render={record => record.inAble === 1 ? '鏄�' : '鍚�'}
- />
+ />
<FunctionField
source="outAble"
label="table.field.basStation.outAble"
render={record => record.inAble === 1 ? '鏄�' : '鍚�'}
/>
- <TextField source="useStatus$" label="table.field.basStation.useStatus" />
- <NumberField source="area$" label="table.field.basStation.area" />
+ <NumberField source="area$" label="table.field.basStation.area" />
<FunctionField
source="isCrossZone"
label="table.field.basStation.isCrossZone"
@@ -151,42 +155,43 @@
<WrapperField cellClassName="crossZoneArea" label="table.field.basStation.crossZoneArea">
<CrossZoneAreaField
open={areaFieldDialog}
- setOpen={setAreaFieldDialog}
- />
- </WrapperField>
+ setOpen={setAreaFieldDialog}
+ />
+ </WrapperField>
<FunctionField
source="isWcs"
label="table.field.basStation.isWcs"
render={record => record.inAble === 1 ? '鏄�' : '鍚�'}
- />
- <NumberField source="containerType$" label="table.field.basStation.containerType" />
- <TextField source="barcode" label="table.field.basStation.barcode" />
+ />
+ <WrapperField cellClassName="containerType" label="table.field.basStation.containerType">
+ <ContainerTypesField
+ open={areaFieldDialog2}
+ setOpen={setAreaFieldDialog2}
+ />
+ </WrapperField>
<FunctionField
source="autoTransfer"
label="table.field.basStation.autoTransfer"
render={record => record.inAble === 1 ? '鏄�' : '鍚�'}
/>
- <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
+ <TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
- <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
- <DateField source="createTime" label="common.field.createTime" showTime />
+ <TextField source="createBy$" label="common.field.createBy" />
+ <DateField source="createTime" label="common.field.createTime" showTime />
+ <BooleanField source="statusBool" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
- <WrapperField cellClassName="opt" label="common.field.opt">
+ <WrapperField cellClassName="opt" label="common.field.opt">
<EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
<DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
- </WrapperField>
+ </WrapperField>
</StyledDatagrid>
-
+
</List>
<BasStationCreate
open={createDialog}
setOpen={setCreateDialog}
/>
-
+
<PageDrawer
title='BasStation Detail'
drawerVal={drawerVal}
--
Gitblit v1.9.1