From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 16:35:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/basicInfo/locType/LocTypeList.jsx | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/locType/LocTypeList.jsx b/rsf-admin/src/page/basicInfo/locType/LocTypeList.jsx
index 58ad20e..2fed32b 100644
--- a/rsf-admin/src/page/basicInfo/locType/LocTypeList.jsx
+++ b/rsf-admin/src/page/basicInfo/locType/LocTypeList.jsx
@@ -45,7 +45,7 @@
import PageDrawer from "../../components/PageDrawer";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
-import MatnrModal from "./MatnrModal";
+import BindModal from "./BindModal";
import LinkIcon from '@mui/icons-material/Link';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
@@ -115,11 +115,11 @@
<StyledDatagrid
preferenceKey='locType'
bulkActionButtons={<>
- <MatnrButton />
+ <BindButton />
<BulkDeleteButton />
</>}
rowClick={(id, resource, record) => false}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy', 'memo','statusBool','updateBy']}
>
<NumberField source="id" />
{/* <TextField source="uuid" label="table.field.locType.uuid" /> */}
@@ -159,7 +159,7 @@
export default LocTypeList;
-const MatnrButton = () => {
+const BindButton = () => {
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
@@ -173,7 +173,7 @@
<LinkIcon />
</Button>
- <MatnrModal
+ <BindModal
open={createDialog}
setOpen={setCreateDialog}
/>
--
Gitblit v1.9.1