From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 16:35:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx b/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
index f82f9c9..f67e60d 100644
--- a/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
+++ b/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
@@ -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
@@ -127,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"
@@ -141,7 +145,7 @@
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"
@@ -158,9 +162,15 @@
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"
--
Gitblit v1.9.1