From cc2984eeb289b54cfa193dde558417c46f309e8f Mon Sep 17 00:00:00 2001
From: DESKTOP-LMJ82IJ\Eno <creaycat@gmail.com>
Date: 星期日, 13 四月 2025 19:32:38 +0800
Subject: [PATCH] #修改 1. 采购单界面优化及修改

---
 rsf-admin/src/page/locAreaRela/LocAreaRelaList.jsx |   53 ++++++++++++++++++-----------------------------------
 1 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/rsf-admin/src/page/qlyIsptItem/QlyIsptItemList.jsx b/rsf-admin/src/page/locAreaRela/LocAreaRelaList.jsx
similarity index 63%
copy from rsf-admin/src/page/qlyIsptItem/QlyIsptItemList.jsx
copy to rsf-admin/src/page/locAreaRela/LocAreaRelaList.jsx
index ff12b3d..cb1ae2b 100644
--- a/rsf-admin/src/page/qlyIsptItem/QlyIsptItemList.jsx
+++ b/rsf-admin/src/page/locAreaRela/LocAreaRelaList.jsx
@@ -34,8 +34,8 @@
 } from 'react-admin';
 import { Box, Typography, Card, Stack } from '@mui/material';
 import { styled } from '@mui/material/styles';
-import QlyIsptItemCreate from "./QlyIsptItemCreate";
-import QlyIsptItemPanel from "./QlyIsptItemPanel";
+import LocAreaRelaCreate from "./LocAreaRelaCreate";
+import LocAreaRelaPanel from "./LocAreaRelaPanel";
 import EmptyData from "../components/EmptyData";
 import MyCreateButton from "../components/MyCreateButton";
 import MyExportButton from '../components/MyExportButton';
@@ -60,19 +60,11 @@
 
 const filters = [
     <SearchInput source="condition" alwaysOn />,
+    <DateInput label='common.time.after' source="timeStart" alwaysOn />,
+    <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
 
-    <NumberInput source="ispectId" label="table.field.qlyIsptItem.ispectId" />,
-    <TextInput source="matnrCode" label="table.field.qlyIsptItem.matnrCode" />,
-    <TextInput source="maktx" label="table.field.qlyIsptItem.maktx" />,
-    <TextInput source="label" label="table.field.qlyIsptItem.label" />,
-    <TextInput source="splrName" label="table.field.qlyIsptItem.splrName" />,
-    <TextInput source="splrBatch" label="table.field.qlyIsptItem.splrBatch" />,
-    <TextInput source="stockBatch" label="table.field.qlyIsptItem.stockBatch" />,
-    <NumberInput source="rcptQty" label="table.field.qlyIsptItem.rcptQty" />,
-    <NumberInput source="dlyQty" label="table.field.qlyIsptItem.dlyQty" />,
-    <NumberInput source="disQty" label="table.field.qlyIsptItem.disQty" />,
-    <NumberInput source="safeQty" label="table.field.qlyIsptItem.safeQty" />,
-    <TextInput source="picPath" label="table.field.qlyIsptItem.picPath" />,
+    <NumberInput source="locAreaId" label="table.field.locAreaRela.locAreaId" />,
+    <NumberInput source="locId" label="table.field.locAreaRela.locId" />,
 
     <TextInput label="common.field.memo" source="memo" />,
     <SelectInput
@@ -86,7 +78,7 @@
     />,
 ]
 
-const QlyIsptItemList = () => {
+const LocAreaRelaList = () => {
     const translate = useTranslate();
 
     const [createDialog, setCreateDialog] = useState(false);
@@ -101,9 +93,9 @@
                         theme.transitions.create(['all'], {
                             duration: theme.transitions.duration.enteringScreen,
                         }),
-                    marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
+                    marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
                 }}
-                title={"menu.qlyIsptItem"}
+                title={"menu.locAreaRela"}
                 empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
                 filters={filters}
                 sort={{ field: "create_time", order: "desc" }}
@@ -111,32 +103,23 @@
                     <TopToolbar>
                         <FilterButton />
                         <MyCreateButton onClick={() => { setCreateDialog(true) }} />
-                        <SelectColumnsButton preferenceKey='qlyIsptItem' />
+                        <SelectColumnsButton preferenceKey='locAreaRela' />
                         <MyExportButton />
                     </TopToolbar>
                 )}
                 perPage={DEFAULT_PAGE_SIZE}
             >
                 <StyledDatagrid
-                    preferenceKey='qlyIsptItem'
+                    preferenceKey='locAreaRela'
                     bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
                     rowClick={(id, resource, record) => false}
+                    expand={() => <LocAreaRelaPanel />}
+                    expandSingle={true}
                     omit={['id', 'createTime', 'createBy', 'memo']}
                 >
                     <NumberField source="id" />
-                    <NumberField source="ispectId" label="table.field.qlyIsptItem.ispectId" />
-                    <TextField source="matnrCode" label="table.field.qlyIsptItem.matnrCode" />
-                    <TextField source="maktx" label="table.field.qlyIsptItem.maktx" />
-                    <TextField source="label" label="table.field.qlyIsptItem.label" />
-                    <TextField source="splrName" label="table.field.qlyIsptItem.splrName" />
-                    <TextField source="splrBatch" label="table.field.qlyIsptItem.splrBatch" />
-                    <TextField source="stockBatch" label="table.field.qlyIsptItem.stockBatch" />
-                    <NumberField source="rcptQty" label="table.field.qlyIsptItem.rcptQty" />
-                    <NumberField source="isptResult$" label="table.field.qlyIsptItem.isptResult" />
-                    <NumberField source="dlyQty" label="table.field.qlyIsptItem.dlyQty" />
-                    <NumberField source="disQty" label="table.field.qlyIsptItem.disQty" />
-                    <NumberField source="safeQty" label="table.field.qlyIsptItem.safeQty" />
-                    <TextField source="picPath" label="table.field.qlyIsptItem.picPath" />
+                    <NumberField source="locAreaId" label="table.field.locAreaRela.locAreaId" />
+                    <NumberField source="locId" label="table.field.locAreaRela.locId" />
 
                     <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
                         <TextField source="nickname" />
@@ -154,12 +137,12 @@
                     </WrapperField>
                 </StyledDatagrid>
             </List>
-            <QlyIsptItemCreate
+            <LocAreaRelaCreate
                 open={createDialog}
                 setOpen={setCreateDialog}
             />
             <PageDrawer
-                title='QlyIsptItem Detail'
+                title='LocAreaRela Detail'
                 drawerVal={drawerVal}
                 setDrawerVal={setDrawerVal}
             >
@@ -168,4 +151,4 @@
     )
 }
 
-export default QlyIsptItemList;
+export default LocAreaRelaList;

--
Gitblit v1.9.1