From d23eb6d53cb10362de2b961e77f45c27ec38196d Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 04 二月 2026 15:03:46 +0800
Subject: [PATCH] #页面持久化
---
rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx | 90 ++++++++++++++++++++------------------------
1 files changed, 41 insertions(+), 49 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index 71ff6c4..bac11a1 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -47,6 +47,7 @@
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': {
@@ -65,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" />,
@@ -118,7 +122,7 @@
}}
title={"menu.asnOrderItem"}
empty={false}
- filter={{ asnId: asnId}}
+ filter={{ orderId: asnId }}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
@@ -160,59 +164,46 @@
const DynamicFields = (props) => {
const translate = useTranslate();
- const notify = useNotify();
+ const notify = useNotify();
const [columns, setColumns] = useState([]);
const { isLoading } = useListContext();
const refresh = useRefresh();
useEffect(() => {
- getDynamicFields();
+ getDynamicFields();
}, []);
const getDynamicFields = async () => {
- const { data: { code, data, msg }, } = await request.get("/fields/enable/list");
- if (code == 200) {
- const arr = [
- <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="platItemId" label="table.field.asnOrderItem.platItemId" />,
- <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" />,
- <TextField source="splrCode" label="table.field.asnOrderItem.splrCode" />,
- <TextField source="splrName" label="table.field.asnOrderItem.splrName" />,
- <TextField source="isptResult$" label="table.field.asnOrderItem.isptResult" />,
- <TextField source="qrcode" label="table.field.asnOrderItem.qrcode" />,
- <TextField source="trackCode" label="table.field.asnOrderItem.barcode" />,
- <TextField source="packName" label="table.field.asnOrderItem.packName" />,
- ]
- const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)
- const lastArr = [
- <DateField source="updateTime" label="common.field.updateTime" showTime />,
- <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>,
- <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>,
- <DateField source="createTime" label="common.field.createTime" showTime />,
- <TextField source="memo" label="common.field.memo" sortable={false} />,
- ]
- setColumns([...arr, ...fields, ...lastArr]);
- } else {
- notify(msg);
- }
+ const result = await fetchInOrderItemColumns();
+ if (result.success) {
+ const hiddenSources = [
+ 'splrName',
+ 'businessTime', 'extendFields.[businessTime]',
+ 'wkType', 'extendFields.[wkType]',
+ 'type', 'extendFields.[type]',
+ 'priceUnitId',
+ 'id', 'orderId', 'orderCode', 'poCode', 'poId','wkType',
+ 'type', 'checkType', 'spec', 'model', 'purQty',
+ '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", }}>
@@ -232,7 +223,8 @@
preferenceKey='asnOrderItem'
bulkActionButtons={false}
rowClick={(id, resource, record) => false}
- omit={['id', 'asnId', 'poDetlId', 'poDetlCode', 'matnrId', 'purQty', 'purUnit', 'qrcode', 'trackCode']}
+ omit={['id', 'orderId', 'orderCode', 'poCode', 'poId', 'wkType', 'type', 'checkType', 'spec', 'model', 'purQty', 'qrcode', 'trackCode', 'splrCode',
+ 'splrName', 'projectCode', 'supplierId', 'supplierName', 'priceUnitId', 'shipperId', 'businessTime', 'extendFields.[businessTime]', 'extendFields.[wkType]', 'extendFields.[type]']}
>
{columns.map((column) => column)}
</StyledDatagrid>}
--
Gitblit v1.9.1