From e0921e578658cc5181bcb9ff76f61ba47e6f0d76 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期六, 24 一月 2026 08:25:49 +0800
Subject: [PATCH] lsh#
---
rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx | 136 +++++++++++++++++++++++++++++---------------
1 files changed, 89 insertions(+), 47 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index e35ba63..4cf419a 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -34,18 +34,20 @@
Button,
useEditContext,
useGetRecordId,
+ useRefresh,
useGetOne
} from 'react-admin';
-import { Box, Typography, Card, Stack, Dialog, DialogActions, DialogTitle } from '@mui/material';
+import { Box, Typography, Card, Stack, Dialog, DialogActions, DialogTitle, LinearProgress } from '@mui/material';
import { styled } from '@mui/material/styles';
import AsnOrderItemCreate from "./AsnOrderItemCreate";
-import EmptyData from "../../components/EmptyData";
-import MyCreateButton from "../../components/MyCreateButton";
-import MyExportButton from '../../components/MyExportButton';
import PageDrawer from "../../components/PageDrawer";
+import DialogCloseButton from "../../components/DialogCloseButton";
+
+import request from '@/utils/request';
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, DEFAULT_ITEM_PAGE_SIZE } from '@/config/setting';
import AsnOrderItemEdit from "./AsnOrderItemEdit";
import ImportButton from "../../components/ImportButton";
+import { fetchInOrderItemColumns } from "../config/orderItemColumns";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -64,12 +66,15 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
- <NumberInput source="asnId" label="table.field.asnOrderItem.asnId" />,
- <TextInput source="asnCode" label="table.field.asnOrderItem.asnCode" />,
+ <NumberInput source="orderId" label="table.field.asnOrderItem.orderId" />,
+ <TextInput source="orderCode" label="table.field.asnOrderItem.orderCode" />,
<TextInput source="poDetlId" label="table.field.asnOrderItem.poDetlId" />,
<TextInput source="poDetlCode" label="table.field.asnOrderItem.poDetlCode" />,
<TextInput source="matnrId" label="table.field.asnOrderItem.matnrId" />,
<TextInput source="maktx" label="table.field.asnOrderItem.maktx" />,
+ <TextInput source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
+ <TextInput source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
+ <TextInput source="projectCode" label="table.field.asnOrderItem.projectCode" />,
<NumberInput source="anfme" label="table.field.asnOrderItem.anfme" />,
<TextInput source="stockUnit" label="table.field.asnOrderItem.stockUnit" />,
<NumberInput source="purQty" label="table.field.asnOrderItem.purQty" />,
@@ -117,7 +122,7 @@
}}
title={"menu.asnOrderItem"}
empty={false}
- filter={{ asnId: asnId, deleted: 0 }}
+ filter={{ orderId: asnId }}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
@@ -130,46 +135,7 @@
)}
perPage={DEFAULT_ITEM_PAGE_SIZE}
>
- <StyledDatagrid
- preferenceKey='asnOrderItem'
- bulkActionButtons={false}
- rowClick={false}
- // rowClick={(id, resource, record) => {
- // setSelect(record)
- // setEditDialog(true)
- // }}
- omit={['id', 'createTime', 'purQty', 'purUnit', 'poDetlCode', 'createBy', 'memo', 'model', 'packName', 'splrCode', 'qrcode', 'poDetlId', 'matnrId', 'asnId']}
- >
- <NumberField source="id" />
- <NumberField source="asnId" label="table.field.asnOrderItem.asnId" />
- <TextField source="asnCode" label="table.field.asnOrderItem.asnCode" />
- <TextField source="poDetlId" label="table.field.asnOrderItem.poDetlId" />
- <TextField source="poDetlCode" label="table.field.asnOrderItem.poDetlCode" />
- <TextField source="matnrId" label="table.field.asnOrderItem.matnrId" />
- <TextField source="matnrCode" label="table.field.asnOrderItem.matnrCode" />
- <TextField source="maktx" label="table.field.asnOrderItem.maktx" />
- <TextField source="splrBatch" label="table.field.asnOrderItem.splrBatch" />
- <TextField source="spec" label="table.field.asnOrderItem.spec" />
- <TextField source="model" label="table.field.asnOrderItem.model" />
- <NumberField source="anfme" label="table.field.asnOrderItem.anfme" />
- <TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" />
- <NumberField source="purQty" label="table.field.asnOrderItem.purQty" />
- <TextField source="purUnit" label="table.field.asnOrderItem.purUnit" />
- <NumberField source="qty" label="table.field.asnOrderItem.qty" />
- <NumberField source="safeQty" label="table.field.asnOrderItem.safeQty" />
- <NumberField source="disQty" label="table.field.asnOrderItem.disQty" />
- <TextField source="isptResult$" label="table.field.asnOrderItem.isptResult" />
- <TextField source="splrCode" label="table.field.asnOrderItem.splrCode" />
- <TextField source="splrName" label="table.field.asnOrderItem.splrName" />
- <TextField source="qrcode" label="table.field.asnOrderItem.qrcode" />
- <TextField source="trackCode" label="table.field.asnOrderItem.barcode" />
- <TextField source="packName" label="table.field.asnOrderItem.packName" />
- <DateField source="updateTime" label="common.field.updateTime" showTime />
- <TextField source="updateBy$" label="common.field.updateBy" />
- <TextField source="createBy$" label="common.field.createBy" />
- <DateField source="createTime" label="common.field.createTime" showTime />
- <TextField source="memo" label="common.field.memo" sortable={false} />
- </StyledDatagrid>
+ <DynamicFields />
</List>
<AsnOrderItemCreate
open={createDialog}
@@ -191,6 +157,82 @@
</>
)
}
+
AsnOrderItemList.Context = React.createContext()
export default AsnOrderItemList;
+
+const DynamicFields = (props) => {
+ const translate = useTranslate();
+ const notify = useNotify();
+ const [columns, setColumns] = useState([]);
+ const { isLoading } = useListContext();
+ const refresh = useRefresh();
+ useEffect(() => {
+ getDynamicFields();
+ }, []);
+
+ const getDynamicFields = async () => {
+ const result = await fetchInOrderItemColumns();
+ if (result.success) {
+ const hiddenSources = [
+ 'splrName',
+ 'businessTime', 'extendFields.[businessTime]',
+ 'wkType', 'extendFields.[wkType]',
+ 'type', 'extendFields.[type]',
+ 'priceUnitId', 'purUnit',
+ 'id', 'orderId', 'orderCode', 'poCode', 'poId','wkType',
+ 'type', 'checkType', 'spec', 'model', 'purQty', 'purUnit',
+ 'qrcode', 'trackCode', 'splrCode', 'splrName', 'projectCode',
+ 'supplierId', 'supplierName', 'shipperId',
+ // 'updateTime', 'updateBy', 'updateBy$',
+ 'createTime', 'createBy', 'createBy$',
+ 'extendFields.[inStockType]', 'extendFields.[baseUnitId]', 'extendFields.[priceUnitId]'
+ ];
+ const columns = result.columns.filter(col => !hiddenSources.includes(col.props.source));
+ setColumns(columns);
+ } else {
+ notify(result.msg);
+ }
+ }
+
+ // const getDynamicFields = async () => {
+ // const result = await fetchInOrderItemColumns();
+ // if (result.success) {
+ // setColumns(result.columns);
+ // } else {
+ // notify(result.msg);
+ // }
+ // }
+
+ return (
+ <Box sx={{ position: 'relative', minHeight: "60vh", }}>
+ {isLoading && (
+ <LinearProgress
+ sx={{
+ height: "2px",
+ position: 'absolute',
+ top: 0,
+ left: 0,
+ right: 0,
+ }}
+ />
+ )}
+ {columns.length > 0 &&
+ <StyledDatagrid
+ preferenceKey='asnOrderItem'
+ bulkActionButtons={false}
+ rowClick={(id, resource, record) => false}
+ omit={['id', 'orderId', 'orderCode', 'poCode', 'poId', 'wkType', 'type', 'checkType', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode',
+ 'splrName', 'projectCode', 'supplierId', 'supplierName', 'priceUnitId', 'shipperId', 'businessTime', 'extendFields.[businessTime]', 'extendFields.[wkType]', 'extendFields.[type]']}
+ >
+ {columns.map((column) => column)}
+ </StyledDatagrid>}
+ </Box>
+ )
+}
+
+
+
+
+
--
Gitblit v1.9.1