From 7f9fa6378436a22a6b7df8c8ddb3af83f42c7d8b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 13:40:11 +0800
Subject: [PATCH] #优化修改 1. 再次收货，先收货30再次收货30累加才对 2. 批次号整个流程走不通 3. 任务工作档排序，最新的永远在最上面
---
rsf-admin/src/page/system/dicts/dictData/DictDataList.jsx | 53 ++++++++++++++++-------------------------------------
1 files changed, 16 insertions(+), 37 deletions(-)
diff --git a/rsf-admin/src/page/system/dicts/dictData/DictDataList.jsx b/rsf-admin/src/page/system/dicts/dictData/DictDataList.jsx
index 65ea973..2b0b618 100644
--- a/rsf-admin/src/page/system/dicts/dictData/DictDataList.jsx
+++ b/rsf-admin/src/page/system/dicts/dictData/DictDataList.jsx
@@ -31,19 +31,18 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
+ useGetRecordId,
+ useGetPathForRecord,
+ useGetOne,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
import DictDataCreate from "./DictDataCreate";
-import DictDataPanel from "./DictDataPanel";
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 CustomerTopToolBar from "../../../components/EditTopToolBar";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
@@ -62,16 +61,12 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
- <DateInput label='common.time.after' source="timeStart" alwaysOn />,
- <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
-
<TextInput source="dictTypeId" label="table.field.dictData.dictTypeId" />,
<TextInput source="dictTypeCode" label="table.field.dictData.dictTypeCode" />,
<TextInput source="value" label="table.field.dictData.value" />,
<TextInput source="label" label="table.field.dictData.label" />,
<NumberInput source="sort" label="table.field.dictData.sort" />,
- <TextInput source="color" label="table.field.dictData.color" />,
-
+ // <TextInput source="color" label="table.field.dictData.color" />,
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -86,37 +81,28 @@
const DictDataList = () => {
const translate = useTranslate();
-
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
- const [fit, setFilters] = useState(filters);
- const location = useLocation();
- const queryParams = new URLSearchParams(location.search);
- const dictTypeId = queryParams.get('dictTypeId');
- console.log(dictTypeId);
- if (dictTypeId != null && dictTypeId != undefined) {
- console.log(dictTypeId);
- console.log(fit);
- }
-
+ const dictId = useGetRecordId();
+ const {data: dicts, isPending, error} = useGetOne('dictType', {id: dictId});
+
return (
<>
- {dictTypeId && <CustomerTopToolBar backPrevious={true} />}
<Box display="flex" >
-
<List
+ resource="dictData"
sx={{
flexGrow: 1,
transition: (theme) =>
theme.transitions.create(['all'], {
duration: theme.transitions.duration.enteringScreen,
}),
- marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
+ marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.dictData"}
empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
filters={filters}
- filter={dictTypeId ? { dictTypeId } : undefined}
+ filter={{ dictTypeId: dictId }}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
@@ -131,9 +117,7 @@
<StyledDatagrid
preferenceKey='dictData'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
- rowClick={(id, resource, record) => false}
- expand={() => <DictDataPanel />}
- expandSingle={true}
+ rowClick="edit"
omit={['id', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
@@ -142,26 +126,21 @@
<TextField source="value" label="table.field.dictData.value" />
<TextField source="label" label="table.field.dictData.label" />
<NumberField source="sort" label="table.field.dictData.sort" />
- <TextField source="color" label="table.field.dictData.color" />
-
- <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} />
<WrapperField cellClassName="opt" label="common.field.opt">
- <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
- <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
+ <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
+ <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} redirect={"/dictType/" + dictId} />
</WrapperField>
</StyledDatagrid>
</List>
<DictDataCreate
open={createDialog}
+ record={dicts}
setOpen={setCreateDialog}
/>
<PageDrawer
--
Gitblit v1.9.1