From bea0dac85e865e3d5dae5b3fd641eb07a4b1b80c Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 21 二月 2025 10:19:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
rsf-admin/src/page/matnr/MatnrList.jsx | 158 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 102 insertions(+), 56 deletions(-)
diff --git a/rsf-admin/src/page/matnr/MatnrList.jsx b/rsf-admin/src/page/matnr/MatnrList.jsx
index fd4ef7b..9c8e8f3 100644
--- a/rsf-admin/src/page/matnr/MatnrList.jsx
+++ b/rsf-admin/src/page/matnr/MatnrList.jsx
@@ -32,7 +32,7 @@
AutocompleteInput,
DeleteButton,
} from 'react-admin';
-import { Box, Typography, Card, Stack } from '@mui/material';
+import { Box, Typography, Card, Stack,LinearProgress } from '@mui/material';
import { styled } from '@mui/material/styles';
import MatnrCreate from "./MatnrCreate";
import MatnrPanel from "./MatnrPanel";
@@ -43,6 +43,8 @@
import MyField from "../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
+import ImportButton from "../components/ImportButton";
+import MatListAside from './MatnrListAside';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -63,14 +65,16 @@
<DateInput label='common.time.after' source="timeStart" alwaysOn />,
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
- <TextInput source="uuid" label="table.field.matnr.uuid" />,
+ <TextInput source="name" label="table.field.matnr.name" />,
+ <TextInput source="code" label="table.field.matnr.code" />,
<ReferenceInput source="shipperId" label="table.field.matnr.shipperId" reference="shipper">
<AutocompleteInput label="table.field.matnr.shipperId" optionText="name" filterToQuery={(val) => ({ name: val })} />
</ReferenceInput>,
- <TextInput source="name" label="table.field.matnr.name" />,
- <TextInput source="code" label="table.field.matnr.code" />,
- <ReferenceInput source="groupId" label="table.field.matnr.groupId" reference="matnrGroup">
+ <ReferenceInput source="groupId" label="table.field.matnr.groupId" reference="matnrGroup" >
<AutocompleteInput label="table.field.matnr.groupId" optionText="code" filterToQuery={(val) => ({ code: val })} />
+ </ReferenceInput>,
+ <ReferenceInput source="rglarId" label="table.field.matnr.rglarId" reference="rglarId">
+ <AutocompleteInput label="table.field.matnr.rglarId" optionText="code" filterToQuery={(val) => ({ code: val })} />
</ReferenceInput>,
<TextInput source="erpCode" label="table.field.matnr.erpCode" />,
<TextInput source="spec" label="table.field.matnr.spec" />,
@@ -78,12 +82,12 @@
<NumberInput source="weight" label="table.field.matnr.weight" />,
<TextInput source="color" label="table.field.matnr.color" />,
<TextInput source="size" label="table.field.matnr.size" />,
- <TextInput source="desc" label="table.field.matnr.desc" />,
+ <TextInput source="describle" label="table.field.matnr.describle" />,
<NumberInput source="nromNum" label="table.field.matnr.nromNum" />,
<TextInput source="unit" label="table.field.matnr.unit" />,
- <TextInput source="purchaseUnit" label="table.field.matnr.purchaseUnit" />,
+ <TextInput source="purchaseUnit" label="table.field.matnr.purUnit" />,
<TextInput source="stockUnit" label="table.field.matnr.stockUnit" />,
- <SelectInput source="stockLeval" label="table.field.matnr.stockLeval"
+ <SelectInput source="stockLeval" label="table.field.matnr.stockLevel"
choices={[
{ id: 0, name: ' A' },
{ id: 1, name: ' B' },
@@ -96,6 +100,13 @@
{ id: 1, name: ' 鏄�' },
]}
/>,
+ <NumberInput source="safeQty" label="table.field.matnr.safeQty" />,
+ <NumberInput source="minQty" label="table.field.matnr.minQty" />,
+ <NumberInput source="maxQty" label="table.field.matnr.maxQty" />,
+ <NumberInput source="stagn" label="table.field.matnr.stagn" />,
+ <NumberInput source="valid" label="table.field.matnr.valid" />,
+ <NumberInput source="validWarn" label="table.field.matnr.validWarn" />,
+ <NumberInput source="flagCheck" label="table.field.matnr.flagCheck" />,
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
@@ -109,11 +120,90 @@
/>,
]
+const MatnrListContent = (props) => {
+ const translate = useTranslate();
+ const { isLoading } = useListContext();
+
+ return (
+ <Box sx={{ position: 'relative' }}>
+ {isLoading && (
+ <LinearProgress
+ sx={{
+ height: "2px",
+ position: 'absolute',
+ top: 0,
+ left: 0,
+ right: 0,
+ }}
+ />
+ )}
+ <StyledDatagrid
+ preferenceKey='matnr'
+ bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ rowClick={(id, resource, record) => false}
+ expand={() => <MatnrPanel />}
+ expandSingle={true}
+ omit={['id', 'createTime', 'createBy', 'memo']}
+ >
+ <NumberField source="id" />
+ <TextField source="name" label="table.field.matnr.name" />
+ <TextField source="code" label="table.field.matnr.code" />
+ <ReferenceField source="shipperId" label="table.field.matnr.shipperId" reference="shipper" link={false} sortable={false}>
+ <TextField source="name" />
+ </ReferenceField>
+ <ReferenceField source="groupId" label="table.field.matnr.groupId" reference="matnrGroup" link={false} sortable={false}>
+ <TextField source="code" />
+ </ReferenceField>
+ <ReferenceField source="rglarId" label="table.field.matnr.rglarId" reference="rglarId" link={false} sortable={false}>
+ <TextField source="code" />
+ </ReferenceField>
+ <TextField source="erpCode" label="table.field.matnr.erpCode" />
+ <TextField source="spec" label="table.field.matnr.spec" />
+ <TextField source="model" label="table.field.matnr.model" />
+ <NumberField source="weight" label="table.field.matnr.weight" />
+ <TextField source="color" label="table.field.matnr.color" />
+ <TextField source="size" label="table.field.matnr.size" />
+ <TextField source="describle" label="table.field.matnr.describle" />
+ <NumberField source="nromNum" label="table.field.matnr.nromNum" />
+ <TextField source="unit" label="table.field.matnr.unit" />
+ <TextField source="purchaseUnit" label="table.field.matnr.purUnit" />
+ <TextField source="stockUnit" label="table.field.matnr.stockUnit" />
+ <TextField source="stockLeval$" label="table.field.matnr.stockLevel" sortable={false} />
+ <TextField source="isLabelMange$" label="table.field.matnr.isLabelMange" sortable={false} />
+ <NumberField source="safeQty" label="table.field.matnr.safeQty" />
+ <NumberField source="minQty" label="table.field.matnr.minQty" />
+ <NumberField source="maxQty" label="table.field.matnr.maxQty" />
+ <NumberField source="stagn" label="table.field.matnr.stagn" />
+ <NumberField source="valid" label="table.field.matnr.valid" />
+ <NumberField source="validWarn" label="table.field.matnr.validWarn" />
+ <NumberField source="flagCheck" label="table.field.matnr.flagCheck" />
+
+ <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}>
+ <TextField source="nickname" />
+ </ReferenceField>
+ <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">
+ <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
+ <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
+ </WrapperField>
+ </StyledDatagrid>
+ </Box>
+ );
+
+}
+
const MatnrList = () => {
const translate = useTranslate();
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
+
return (
<Box display="flex">
@@ -135,58 +225,14 @@
<FilterButton />
<MyCreateButton onClick={() => { setCreateDialog(true) }} />
<SelectColumnsButton preferenceKey='matnr' />
+ <ImportButton />
<MyExportButton />
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
+ aside={ <MatListAside /> }
>
- <StyledDatagrid
- preferenceKey='matnr'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
- rowClick={(id, resource, record) => false}
- expand={() => <MatnrPanel />}
- expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
- >
- <NumberField source="id" />
- <TextField source="uuid" label="table.field.matnr.uuid" />
- <ReferenceField source="shipperId" label="table.field.matnr.shipperId" reference="shipper" link={false} sortable={false}>
- <TextField source="name" />
- </ReferenceField>
- <TextField source="name" label="table.field.matnr.name" />
- <TextField source="code" label="table.field.matnr.code" />
- <ReferenceField source="groupId" label="table.field.matnr.groupId" reference="matnrGroup" link={false} sortable={false}>
- <TextField source="code" />
- </ReferenceField>
- <TextField source="erpCode" label="table.field.matnr.erpCode" />
- <TextField source="spec" label="table.field.matnr.spec" />
- <TextField source="model" label="table.field.matnr.model" />
- <NumberField source="weight" label="table.field.matnr.weight" />
- <TextField source="color" label="table.field.matnr.color" />
- <TextField source="size" label="table.field.matnr.size" />
- <TextField source="desc" label="table.field.matnr.desc" />
- <NumberField source="nromNum" label="table.field.matnr.nromNum" />
- <TextField source="unit" label="table.field.matnr.unit" />
- <TextField source="purchaseUnit" label="table.field.matnr.purchaseUnit" />
- <TextField source="stockUnit" label="table.field.matnr.stockUnit" />
- <TextField source="stockLeval$" label="table.field.matnr.stockLeval" sortable={false} />
- <TextField source="isLabelMange$" label="table.field.matnr.isLabelMange" sortable={false} />
-
- <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}>
- <TextField source="nickname" />
- </ReferenceField>
- <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">
- <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
- <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
- </WrapperField>
- </StyledDatagrid>
+ <MatnrListContent />
</List>
<MatnrCreate
open={createDialog}
@@ -202,4 +248,4 @@
)
}
-export default MatnrList;
+export default MatnrList;
\ No newline at end of file
--
Gitblit v1.9.1