From b5e8045d5f5b5401b696db12f62fdbcc86dc5c5d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 四月 2025 11:40:02 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/system/serialRule/SerialRuleList.jsx | 28 ++++++----------------------
1 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/rsf-admin/src/page/system/serialRule/SerialRuleList.jsx b/rsf-admin/src/page/system/serialRule/SerialRuleList.jsx
index 6008fab..8b4c623 100644
--- a/rsf-admin/src/page/system/serialRule/SerialRuleList.jsx
+++ b/rsf-admin/src/page/system/serialRule/SerialRuleList.jsx
@@ -72,7 +72,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" />,
@@ -100,10 +99,10 @@
const [drawerVal, setDrawerVal] = useState(false);
const [detailDialog, setDetailDialog] = useState(false);
- 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,26 +144,11 @@
bulkActionButtons={() => (
<BulkDeleteButton mutationMode={OPERATE_MODE} />
)}
- rowClick={(id, resource, record) => false}
+ 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" />
--
Gitblit v1.9.1