From ceab656e93edafbdaa0d908a2f723336af811b5a Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期三, 03 九月 2025 12:47:23 +0800
Subject: [PATCH] 站点任务功能优化
---
rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx b/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
index 6509b57..b757e28 100644
--- a/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
+++ b/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
@@ -45,6 +45,8 @@
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
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': {
@@ -62,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" />,
@@ -95,7 +97,8 @@
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
@@ -126,10 +129,12 @@
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy', 'memo','updateBy','autoTransfer']}
>
<NumberField source="id" />
<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"
@@ -140,22 +145,31 @@
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" />
<FunctionField
source="isCrossZone"
label="table.field.basStation.isCrossZone"
render={record => record.inAble === 1 ? '鏄�' : '鍚�'}
/>
- <TextField source="crossZoneArea" label="table.field.basStation.crossZoneArea" />
-
+ <WrapperField cellClassName="crossZoneArea" label="table.field.basStation.crossZoneArea">
+ <CrossZoneAreaField
+ open={areaFieldDialog}
+ 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"
@@ -168,18 +182,21 @@
<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 />
+ <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