From c462b499e6812f073efdcceecd94f655883c0d36 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 16:34:08 +0800
Subject: [PATCH] erp物料对接修改
---
rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx | 55 ++++++++++++++++++++++++++-----------------------------
1 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx b/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
index a4aa944..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';
@@ -64,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" />,
@@ -127,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"
@@ -153,48 +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" />
+ />
<WrapperField cellClassName="containerType" label="table.field.basStation.containerType">
<ContainerTypesField
open={areaFieldDialog2}
- setOpen={setAreaFieldDialog2}
- />
+ setOpen={setAreaFieldDialog2}
+ />
</WrapperField>
- <TextField source="barcode" label="table.field.basStation.barcode" />
<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