From e211113fb94de4b54577fbcf6986bd5297b1e19e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 05 五月 2025 16:53:33 +0800
Subject: [PATCH] 收货单优化
---
rsf-admin/src/page/system/serialRule/SerialRuleItemList.jsx | 66 ++++++++++++++-------------------
1 files changed, 28 insertions(+), 38 deletions(-)
diff --git a/rsf-admin/src/page/system/serialRule/SerialRuleItemList.jsx b/rsf-admin/src/page/system/serialRule/SerialRuleItemList.jsx
index 709c9f4..a4a436d 100644
--- a/rsf-admin/src/page/system/serialRule/SerialRuleItemList.jsx
+++ b/rsf-admin/src/page/system/serialRule/SerialRuleItemList.jsx
@@ -38,6 +38,8 @@
AutocompleteInput,
DeleteButton,
useGetRecordId,
+ useGetOne,
+ Button,
} from "react-admin";
import { Box, Typography, Card, Stack } from "@mui/material";
import { styled } from "@mui/material/styles";
@@ -54,6 +56,7 @@
} from "@/config/setting";
import * as Common from "@/utils/common";
import CustomerTopToolBar from "../../components/EditTopToolBar";
+import SerialRuleItemEdit from "./SerialRuleItemEdit";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
"& .css-1vooibu-MuiSvgIcon-root": {
@@ -72,17 +75,12 @@
<SearchInput source="condition" alwaysOn />,
<DateInput label="common.time.after" source="timeStart" />,
<DateInput label="common.time.before" source="timeEnd" />,
-
<NumberInput source="ruleId" label="table.field.serialRuleItem.ruleId" />,
<TextInput source="wkType" label="table.field.serialRuleItem.wkType" />,
- <TextInput
- source="feildValue"
- label="table.field.serialRuleItem.feildValue"
- />,
+ <TextInput source="feildValue" label="table.field.serialRuleItem.feildValue" />,
<NumberInput source="len" label="table.field.serialRuleItem.len" />,
<NumberInput source="lenStr" label="table.field.serialRuleItem.lenStr" />,
<NumberInput source="sort" label="table.field.serialRuleItem.sort" />,
-
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -98,13 +96,13 @@
const SerialRuleItemList = () => {
const translate = useTranslate();
const [createDialog, setCreateDialog] = useState(false);
+ const [editDialog, setEditDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
- const location = useLocation();
+ const [select, setSelect] = useState({});
const ruleId = useGetRecordId();
-
+ const { data: dicts, isPending, error } = useGetOne('serialRule', { id: ruleId });
return (
<>
- {ruleId && <CustomerTopToolBar backPrevious={true} />}
<Box display="flex">
<List
resource="serialRuleItem"
@@ -117,16 +115,10 @@
marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.serialRuleItem"}
- empty={
- <EmptyData
- onClick={() => {
- setCreateDialog(true);
- }}
- />
- }
+ empty={false}
filters={filters}
filter={{ ruleId: ruleId }}
- sort={{ field: "create_time", order: "desc" }}
+ sort={{ field: "sort", order: "asc" }}
actions={
<TopToolbar>
<FilterButton />
@@ -146,8 +138,11 @@
bulkActionButtons={() => (
<BulkDeleteButton mutationMode={OPERATE_MODE} />
)}
- rowClick={false}
- omit={["id", "createTime", "createBy", "memo"]}
+ rowClick={(id, resource, record) => {
+ setSelect(record)
+ setEditDialog(true)
+ }}
+ omit={["id", "ruleId", "createTime", "createBy", "memo"]}
>
<NumberField source="id" />
<NumberField
@@ -171,30 +166,19 @@
source="sort"
label="table.field.serialRuleItem.sort"
/>
-
- <ReferenceField
- source="updateBy"
+ <TextField
+ 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"
+ <TextField
+ source="createBy$"
label="common.field.createBy"
- reference="user"
- link={false}
- sortable={false}
- >
- <TextField source="nickname" />
- </ReferenceField>
+ />
<DateField
source="createTime"
label="common.field.createTime"
@@ -211,15 +195,21 @@
sortable={false}
/>
<WrapperField cellClassName="opt" label="common.field.opt">
- <EditButton sx={{ padding: "1px", fontSize: ".75rem" }} />
+ <Button onClick={() => {
+ // setSelect(record)
+ setEditDialog(true)
+ }} label={'ra.action.edit'}
+ > </Button>
<DeleteButton
sx={{ padding: "1px", fontSize: ".75rem" }}
mutationMode={OPERATE_MODE}
+ redirect={'/serialRule/' + ruleId}
/>
</WrapperField>
</StyledDatagrid>
</List>
- <SerialRuleItemCreate open={createDialog} setOpen={setCreateDialog} />
+ <SerialRuleItemCreate open={createDialog} setOpen={setCreateDialog} record={dicts} />
+ <SerialRuleItemEdit open={editDialog} setOpen={setEditDialog} record={select} />
<PageDrawer
title="SerialRuleItem Detail"
drawerVal={drawerVal}
--
Gitblit v1.9.1