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/orders/stock/OrderList.jsx | 48 ++++++++++++++++++++----------------------------
1 files changed, 20 insertions(+), 28 deletions(-)
diff --git a/rsf-admin/src/page/orders/stock/OrderList.jsx b/rsf-admin/src/page/orders/stock/OrderList.jsx
index 95bff50..516fea9 100644
--- a/rsf-admin/src/page/orders/stock/OrderList.jsx
+++ b/rsf-admin/src/page/orders/stock/OrderList.jsx
@@ -32,17 +32,19 @@
AutocompleteInput,
DeleteButton,
} from 'react-admin';
-import { Box, Typography, Card, Stack } from '@mui/material';
-import { styled } from '@mui/material/styles';
-import OrderCreate from "./OrderCreate";
-import OrderPanel from "./OrderPanel";
-import EmptyData from "../../components/EmptyData";
+
+import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import MyCreateButton from "../../components/MyCreateButton";
import MyExportButton from '../../components/MyExportButton';
+import { Box, Typography, Card, Stack } from '@mui/material';
import PageDrawer from "../../components/PageDrawer";
+import EmptyData from "../../components/EmptyData";
import MyField from "../../components/MyField";
-import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
+import { styled } from '@mui/material/styles';
import * as Common from '@/utils/common';
+import OrderCreate from "./OrderCreate";
+import OrderPanel from "./OrderPanel";
+
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -62,14 +64,12 @@
<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.stock.code" />,
<TextInput source="sourceCode" label="table.field.stock.sourceCode" />,
<NumberInput source="sourceId" label="table.field.stock.sourceId" />,
<TextInput source="type" label="table.field.stock.type" />,
<TextInput source="wkType" label="table.field.stock.wkType" />,
<NumberInput source="anfme" label="table.field.stock.anfme" />,
-
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -83,9 +83,9 @@
]
const OrderList = () => {
- const translate = useTranslate();
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
+ const translate = useTranslate();
return (
<Box display="flex">
@@ -99,7 +99,7 @@
marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.stock"}
- empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ empty={false}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
@@ -113,33 +113,25 @@
>
<StyledDatagrid
preferenceKey='stock'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
- rowClick={(id, resource, record) => false}
- expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ bulkActionButtons={false}
+ rowClick='edit'
+ expandSingle={false}
+ omit={['id', 'sourceId', 'memo','statusBool','opt']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.stock.code" />
<TextField source="sourceCode" label="table.field.stock.sourceCode" />
<NumberField source="sourceId" label="table.field.stock.sourceId" />
- <TextField source="type" label="table.field.stock.type" />
- <TextField source="wkType" label="table.field.stock.wkType" />
+ <TextField source="locCode" label="table.field.locArea.locId" />,
+ <TextField source="barcode" label="table.field.task.barcode" />,
+ <TextField source="type$" label="table.field.stock.type" />
+ <TextField source="wkType$" label="table.field.stock.wkType" />
<NumberField source="anfme" label="table.field.stock.anfme" />
-
- <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
+ <TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
- <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
+ <TextField source="createBy$" label="common.field.createBy" />
<DateField source="createTime" label="common.field.createTime" showTime />
- <BooleanField source="statusBool" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
- <WrapperField cellClassName="opt" label="common.field.opt">
- <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
- <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
- </WrapperField>
</StyledDatagrid>
</List>
<OrderCreate
--
Gitblit v1.9.1