From 81fa2ee00313e7f786be6f5c109b92ed612f61c1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 05 八月 2025 13:00:05 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/stockManage/locRevise/LocReviseList.jsx | 70 +++++++++++++++-------------------
1 files changed, 31 insertions(+), 39 deletions(-)
diff --git a/rsf-admin/src/page/locRevise/LocReviseList.jsx b/rsf-admin/src/page/stockManage/locRevise/LocReviseList.jsx
similarity index 77%
rename from rsf-admin/src/page/locRevise/LocReviseList.jsx
rename to rsf-admin/src/page/stockManage/locRevise/LocReviseList.jsx
index 26e4732..efdc6fc 100644
--- a/rsf-admin/src/page/locRevise/LocReviseList.jsx
+++ b/rsf-admin/src/page/stockManage/locRevise/LocReviseList.jsx
@@ -32,17 +32,17 @@
AutocompleteInput,
DeleteButton,
} from 'react-admin';
-import { Box, Typography, Card, Stack } from '@mui/material';
-import { styled } from '@mui/material/styles';
-import LocReviseCreate from "./LocReviseCreate";
-import LocRevisePanel from "./LocRevisePanel";
-import EmptyData from "../components/EmptyData";
-import MyCreateButton from "../components/MyCreateButton";
-import MyExportButton from '../components/MyExportButton';
-import PageDrawer from "../components/PageDrawer";
-import MyField from "../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
-import * as Common from '@/utils/common';
+import MyCreateButton from "@/page/components/MyCreateButton";
+import MyExportButton from '@/page/components/MyExportButton';
+import PageEditDrawer from "@/page/components/PageEditDrawer";
+import { Box, Typography, Card, Stack } from '@mui/material';
+import PageDrawer from "@/page/components/PageDrawer";
+import EmptyData from "@/page/components/EmptyData";
+import LocReviseCreate from "./LocReviseCreate";
+import MyField from "@/page/components/MyField";
+import { styled } from '@mui/material/styles';
+import LocRevisePanel from "./LocRevisePanel";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -62,12 +62,11 @@
<SearchInput source="condition" alwaysOn />,
<DateInput label='common.time.after' source="timeStart" alwaysOn />,
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
-
<TextInput source="code" label="table.field.locRevise.code" />,
<SelectInput source="type" label="table.field.locRevise.type"
choices={[
{ id: 0, name: ' 搴撳瓨璋冩暣' },
- { id: 2, name: ' 鐩樼偣璋冩暣' },
+ { id: 2, name: ' 鐩樼偣璋冩暣' },
]}
/>,
<NumberInput source="anfme" label="table.field.locRevise.anfme" />,
@@ -75,13 +74,12 @@
<SelectInput source="exceStatus" label="table.field.locRevise.exceStatus"
choices={[
{ id: 0, name: '鏈墽琛�' },
- { id: 1, name: '鎵ц涓�' },
- { id: 2, name: '鎵ц瀹屾垚' },
+ { id: 1, name: '鎵ц涓�' },
+ { id: 2, name: '鎵ц瀹屾垚' },
]}
/>,
<NumberInput source="orgAreaId" label="table.field.locRevise.orgAreaId" />,
<TextInput source="orgAreaName" label="table.field.locRevise.orgAreaName" />,
-
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -95,10 +93,9 @@
]
const LocReviseList = () => {
- const translate = useTranslate();
-
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
+ const translate = useTranslate();
return (
<Box display="flex">
@@ -112,7 +109,7 @@
marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.locRevise"}
- empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ empty={false}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
@@ -127,11 +124,11 @@
>
<StyledDatagrid
preferenceKey='locRevise'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ bulkActionButtons={false}
rowClick={(id, resource, record) => false}
- expand={() => <LocRevisePanel />}
+ expand={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy', 'orgAreaId', 'memo']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.locRevise.code" />
@@ -139,16 +136,11 @@
<NumberField source="anfme" label="table.field.locRevise.anfme" />
<NumberField source="reviseQty" label="table.field.locRevise.reviseQty" />
<TextField source="exceStatus$" label="table.field.locRevise.exceStatus" sortable={false} />
- <NumberField source="orgAreaId" label="table.field.locRevise.orgAreaId" />
- <TextField source="orgAreaName" label="table.field.locRevise.orgAreaName" />
-
- <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
+ <NumberField source="orgAreaId" label="table.field.locRevise.areaId" />
+ <TextField source="orgAreaName" label="table.field.locRevise.areaName" />
+ <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="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} />
@@ -158,16 +150,16 @@
</WrapperField>
</StyledDatagrid>
</List>
- <LocReviseCreate
- open={createDialog}
- setOpen={setCreateDialog}
- />
- <PageDrawer
- title='LocRevise Detail'
- drawerVal={drawerVal}
- setDrawerVal={setDrawerVal}
+ <PageEditDrawer
+ title={"toolbar.createLocRevise"}
+ drawerVal={createDialog}
+ setDrawerVal={setCreateDialog}
>
- </PageDrawer>
+ <LocReviseCreate
+ open={createDialog}
+ setOpen={setCreateDialog}
+ />
+ </PageEditDrawer>
</Box>
)
}
--
Gitblit v1.9.1