From 014270352f8e19b51bbb4367ae2ff256050a30a2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 四月 2025 14:03:42 +0800
Subject: [PATCH] #修改优化 1. 字典优化修改 2. 编码规则优化 3. 出库单编码生成为空问题修复
---
rsf-admin/src/page/system/serialRule/SerialRuleList.jsx | 70 ++++++++++-------------------------
1 files changed, 20 insertions(+), 50 deletions(-)
diff --git a/rsf-admin/src/page/system/serialRule/SerialRuleList.jsx b/rsf-admin/src/page/system/serialRule/SerialRuleList.jsx
index a46f0fe..0e8a0c5 100644
--- a/rsf-admin/src/page/system/serialRule/SerialRuleList.jsx
+++ b/rsf-admin/src/page/system/serialRule/SerialRuleList.jsx
@@ -41,13 +41,11 @@
import { Box, Typography, Card, Stack } from "@mui/material";
import { styled } from "@mui/material/styles";
import SerialRuleCreate from "./SerialRuleCreate";
-import SerialRuleDetail from "./SerialRuleDetail";
-import SerialRulePanel from "./SerialRulePanel";
-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 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,
@@ -72,7 +70,6 @@
<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.serialRule.code" />,
<TextInput source="name" label="table.field.serialRule.name" />,
<TextInput source="delimit" label="table.field.serialRule.delimit" />,
@@ -80,7 +77,6 @@
<TextInput source="resetDep" label="table.field.serialRule.resetDep" />,
<TextInput source="currValue" label="table.field.serialRule.currValue" />,
<TextInput source="lastCode" label="table.field.serialRule.lastCode" />,
-
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -99,11 +95,12 @@
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
const [detailDialog, setDetailDialog] = useState(false);
+ const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_rule_item_type')) || [];
- const navigate = useNavigate();
- const assign = (record) => {
- navigate(`/serialRuleItem?ruleId=${record.id}`);
- };
+ // const navigate = useNavigate();
+ // const assign = (record) => {
+ // navigate(`/serialRuleItem?ruleId=${record.id}`);
+ // };
return (
<Box display="flex">
@@ -145,31 +142,14 @@
bulkActionButtons={() => (
<BulkDeleteButton mutationMode={OPERATE_MODE} />
)}
- rowClick={(id, resource, record) => false}
- expand={() => <SerialRulePanel />}
- expandSingle={true}
+ rowClick={'edit'}
omit={["id", "createTime", "createBy", "memo"]}
>
<NumberField source="id" />
- <MyField
- source="code"
- label="table.field.serialRule.code"
- onClick={(event, record, val) => {
- event.stopPropagation();
- assign(record);
- }}
- />
- {/* <MyField
- source="code"
- label="table.field.serialRule.code"
- onClick={() => {
- setDetailDialog(true);
- }}
- /> */}
-
+ <TextField source="code" label="table.field.serialRule.code" />
<TextField source="name" label="table.field.serialRule.name" />
<TextField source="delimit" label="table.field.serialRule.delimit" />
- <TextField source="reset" label="table.field.serialRule.reset" />
+ <TextField label="table.field.serialRule.reset" source="reset$" />
<TextField
source="resetDep"
label="table.field.serialRule.resetDep"
@@ -183,29 +163,19 @@
label="table.field.serialRule.lastCode"
/>
- <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"
@@ -227,7 +197,7 @@
</StyledDatagrid>
</List>
<SerialRuleCreate open={createDialog} setOpen={setCreateDialog} />
- <SerialRuleDetail open={detailDialog} setOpen={setDetailDialog} />
+ {/* <SerialRuleDetail open={detailDialog} setOpen={setDetailDialog} /> */}
<PageDrawer
title="SerialRule Detail"
drawerVal={drawerVal}
--
Gitblit v1.9.1