From 4d9b73a4e5acf3f3b97ebbdb69154c704bb3077d Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期四, 10 四月 2025 09:03:11 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/asnOrderLog/AsnOrderLogList.jsx | 39 ++++-----------------------------------
1 files changed, 4 insertions(+), 35 deletions(-)
diff --git a/rsf-admin/src/page/asnOrderLog/AsnOrderLogList.jsx b/rsf-admin/src/page/asnOrderLog/AsnOrderLogList.jsx
index 78ae947..29c4a09 100644
--- a/rsf-admin/src/page/asnOrderLog/AsnOrderLogList.jsx
+++ b/rsf-admin/src/page/asnOrderLog/AsnOrderLogList.jsx
@@ -31,8 +31,6 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
- useRefresh,
- Button,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -45,7 +43,6 @@
import MyField from "../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
-import ReplayIcon from '@mui/icons-material/Replay';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -57,7 +54,7 @@
'& .column-name': {
},
'& .opt': {
- width: 300
+ width: 200
},
}));
@@ -101,7 +98,6 @@
const AsnOrderLogList = () => {
const translate = useTranslate();
-
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
@@ -123,7 +119,7 @@
actions={(
<TopToolbar>
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+ {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
<SelectColumnsButton preferenceKey='asnOrderLog' />
<MyExportButton />
</TopToolbar>
@@ -133,8 +129,8 @@
<StyledDatagrid
preferenceKey='asnOrderLog'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
- rowClick={(id, resource, record) => false}
- expand={() => <AsnOrderLogPanel />}
+ rowClick={'edit'}
+ expand={false}
expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo']}
>
@@ -161,11 +157,6 @@
<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} />
- <RecoverButton />
- </WrapperField>
</StyledDatagrid>
</List>
<AsnOrderLogCreate
@@ -183,25 +174,3 @@
}
export default AsnOrderLogList;
-
-const RecoverButton = () => {
- const record = useRecordContext();
- const notify = useNotify();
- const refresh = useRefresh();
- const requestRecover = async () => {
- const { data: { code, data, msg } } = await request.post(`/asnOrder/recover/${record.id}`);
-
- if (code === 200) {
- notify(msg);
- refresh()
- } else {
- notify(msg);
- }
- }
-
- return (
- (<Button onClick={requestRecover} label={"toolbar.recover"} color="success">
- <ReplayIcon />
- </Button>)
- )
-}
--
Gitblit v1.9.1