From 60a665f3c576f8fe368ddfaabc9117a9c5dd47bf Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 02 八月 2025 09:56:30 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/locPreview/LocPreviewItems.jsx | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/rsf-admin/src/page/locItem/LocQueryList.jsx b/rsf-admin/src/page/locPreview/LocPreviewItems.jsx
similarity index 92%
rename from rsf-admin/src/page/locItem/LocQueryList.jsx
rename to rsf-admin/src/page/locPreview/LocPreviewItems.jsx
index 64efb9d..0776a7b 100644
--- a/rsf-admin/src/page/locItem/LocQueryList.jsx
+++ b/rsf-admin/src/page/locPreview/LocPreviewItems.jsx
@@ -1,5 +1,4 @@
import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
-import { useNavigate } from 'react-router-dom';
import {
List,
DatagridConfigurable,
@@ -34,10 +33,11 @@
DeleteButton,
useGetRecordId,
} from 'react-admin';
-import { Box, Typography, Card, Stack, LinearProgress } from '@mui/material';
-import { styled } from '@mui/material/styles';
-import PageDrawer from "../components/PageDrawer";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
+import { Box, Typography, Card, Stack, LinearProgress } from '@mui/material';
+import PageDrawer from "../components/PageDrawer";
+import { useNavigate } from 'react-router-dom';
+import { styled } from '@mui/material/styles';
import request from '@/utils/request';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
@@ -53,10 +53,10 @@
width: 100
},
'& .MuiTableCell-root': {
- whiteSpace: 'nowrap',
- overflow: 'visible',
- textOverflow: 'unset'
- }
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
}));
const filters = [
@@ -94,12 +94,13 @@
/>,
]
-const LocItemList = () => {
- const translate = useTranslate();
+const LocPreviewItems = () => {
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
+ const translate = useTranslate();
const locId = useGetRecordId();
-
+ console.log(locId);
+
return (
<Box display="flex">
<List
@@ -111,15 +112,16 @@
}),
marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
- title={"menu.locItem"}
+ title={"menu.locPreview"}
empty={false}
- filter={{locId: locId}}
+ resource="locItem"
+ filter={{ locId: locId }}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
- <SelectColumnsButton preferenceKey='locItem' />
+ <SelectColumnsButton preferenceKey='locPreview' />
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
@@ -136,15 +138,16 @@
)
}
-export default LocItemList;
+export default LocPreviewItems;
const DynamicFields = (props) => {
- const translate = useTranslate();
- const notify = useNotify();
const [columns, setColumns] = useState([]);
const { isLoading } = useListContext();
+ const translate = useTranslate();
const refresh = useRefresh();
+ const notify = useNotify();
+
useEffect(() => {
getDynamicFields();
}, []);
@@ -205,12 +208,12 @@
)}
{columns.length > 0 &&
<StyledDatagrid
- preferenceKey='locItem'
+ preferenceKey='locPreview'
bulkActionButtons={false}
rowClick={false}
expand={false}
expandSingle={true}
- omit={['id', 'createTime','spec', 'model', 'locId', 'orderId', 'trackCode', 'orderItemId', 'matnrId', 'splrBatch','createBy$', 'memo', 'fieldsIndex','statusBool']}
+ omit={['id', 'createTime', 'spec', 'model', 'locId', 'orderId', 'trackCode', 'orderItemId', 'matnrId', 'splrBatch', 'createBy$', 'memo', 'fieldsIndex', 'statusBool']}
>
{columns.map((column) => column)}
</StyledDatagrid>}
--
Gitblit v1.9.1