From f695b59337121fb6c93251e73bdfb3fc8e847cc8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 25 七月 2025 17:07:09 +0800
Subject: [PATCH] 调拔单功能优化
---
rsf-admin/src/page/orders/transfer/TransferList.jsx | 52 ++++++++++++++++++++++------------------------------
1 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/rsf-admin/src/page/orders/transfer/TransferList.jsx b/rsf-admin/src/page/orders/transfer/TransferList.jsx
index 790702b..3e6b4fa 100644
--- a/rsf-admin/src/page/orders/transfer/TransferList.jsx
+++ b/rsf-admin/src/page/orders/transfer/TransferList.jsx
@@ -33,16 +33,19 @@
DeleteButton,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
-import { styled } from '@mui/material/styles';
-import TransferCreate from "./TransferCreate.jsx";
-import TransferPanel from "./TransferPanel.jsx";
-import EmptyData from "../../components/EmptyData.jsx";
+import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting.js';
+
import MyCreateButton from "../../components/MyCreateButton.jsx";
import MyExportButton from '../../components/MyExportButton.jsx';
+import PageEditDrawer from "../../components/PageEditDrawer";
import PageDrawer from "../../components/PageDrawer.jsx";
+import EmptyData from "../../components/EmptyData.jsx";
import MyField from "../../components/MyField.jsx";
-import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting.js';
+import TransferCreate from "./TransferCreate.jsx";
+import { styled } from '@mui/material/styles';
+import TransferPanel from "./TransferPanel.jsx";
import * as Common from '@/utils/common.js';
+import ManualCreate from "./ManualCreate.jsx";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -62,22 +65,21 @@
<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.transfer.code" />,
<NumberInput source="type" label="table.field.transfer.type" />,
<SelectInput source="source" label="table.field.transfer.source"
choices={[
{ id: 1, name: 'ERP绯荤粺' },
- { id: 2, name: 'WMS绯荤粺鐢熸垚' },
- { id: 3, name: 'EXCEL瀵煎叆 ' },
- { id: 4, name: 'QMS绯荤粺' },
+ { id: 2, name: 'WMS绯荤粺鐢熸垚' },
+ { id: 3, name: 'EXCEL瀵煎叆 ' },
+ { id: 4, name: 'QMS绯荤粺' },
]}
/>,
<SelectInput source="exceStatus" label="table.field.transfer.exceStatus"
choices={[
{ id: 0, name: '鏈墽琛�' },
- { id: 1, name: '鎵ц涓�' },
- { id: 2, name: '鎵ц瀹屾垚' },
+ { id: 1, name: '鎵ц涓�' },
+ { id: 2, name: '鎵ц瀹屾垚' },
]}
/>,
<NumberInput source="orgWareId" label="table.field.transfer.orgWareId" />,
@@ -88,7 +90,6 @@
<TextInput source="orgAreaName" label="table.field.transfer.orgAreaName" />,
<NumberInput source="tarAreaId" label="table.field.transfer.tarAreaId" />,
<TextInput source="tarAreaName" label="table.field.transfer.tarAreaName" />,
-
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -103,7 +104,6 @@
const TransferList = () => {
const translate = useTranslate();
-
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
@@ -138,7 +138,7 @@
rowClick={(id, resource, record) => false}
expand={() => <TransferPanel />}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy$', 'memo']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.transfer.code" />
@@ -153,14 +153,9 @@
<TextField source="orgAreaName" label="table.field.transfer.orgAreaName" />
<NumberField source="tarAreaId" label="table.field.transfer.tarAreaId" />
<TextField source="tarAreaName" label="table.field.transfer.tarAreaName" />
-
- <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>
+ <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} />
@@ -170,16 +165,13 @@
</WrapperField>
</StyledDatagrid>
</List>
- <TransferCreate
- open={createDialog}
- setOpen={setCreateDialog}
- />
- <PageDrawer
- title='Transfer Detail'
- drawerVal={drawerVal}
- setDrawerVal={setDrawerVal}
+ <PageEditDrawer
+ title={"toolbar.createTransfer"}
+ drawerVal={createDialog}
+ setDrawerVal={setCreateDialog}
>
- </PageDrawer>
+ <ManualCreate />
+ </PageEditDrawer>
</Box>
)
}
--
Gitblit v1.9.1