From bfc43ca0e4683c1c0322a6cad5d5be2bc07decc3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 24 七月 2025 15:00:44 +0800
Subject: [PATCH] 新增调拔单功能 盘点功能优化
---
rsf-admin/src/page/statistics/stockManage/WarehouseHistories.jsx | 128 +++++++++++++++++++++++++++++++-----------
1 files changed, 93 insertions(+), 35 deletions(-)
diff --git a/rsf-admin/src/page/statistics/stockManage/WarehouseHistories.jsx b/rsf-admin/src/page/statistics/stockManage/WarehouseHistories.jsx
index 7eaff96..eab020b 100644
--- a/rsf-admin/src/page/statistics/stockManage/WarehouseHistories.jsx
+++ b/rsf-admin/src/page/statistics/stockManage/WarehouseHistories.jsx
@@ -1,4 +1,4 @@
-import { Dialog, DialogActions, DialogContent, DialogTitle, Box } from "@mui/material";
+import { Dialog, DialogActions, DialogContent, DialogTitle, Box, LinearProgress } from "@mui/material";
import React, { useState, useRef, useEffect, useMemo } from "react";
import {
List,
@@ -146,7 +146,7 @@
}}
title={"menu.stockItem"}
empty={false}
- filter={{ stock: record }}
+ filter={{ stock: record, aggType: record?.aggType }}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
@@ -156,39 +156,7 @@
)}
perPage={DEFAULT_ITEM_PAGE_SIZE}
>
- <StyledDatagrid
- preferenceKey='stockHistories'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
- rowClick={(id, resource, record) => false}
- expand={false}
- expandSingle={true}
- omit={['id', 'createTime', 'orderId', 'sourceItemId', 'matnrId', 'createBy', 'barcode', 'splrCode', 'splrBatch', 'updateBy$', 'createBy$', 'memo']}
- >
- <NumberField source="id" />
- <NumberField source="orderId" label="table.field.stockItem.orderId" />
- <TextField source="orderCode" label="table.field.stockItem.orderCode" />
- <TextField source="sourceItemId" label="table.field.stockItem.sourceItemId" />
- <TextField source="matnrId" label="table.field.stockItem.matnrId" />
- <TextField source="matnrCode" label="table.field.stockItem.matnrCode" />
- <TextField source="maktx" label="table.field.stockItem.maktx" />
- <NumberField source="anfme" label="table.field.stockItem.anfme" />
- <TextField source="stockUnit" label="table.field.stockItem.stockUnit" />
- <NumberField source="workQty" label="table.field.stockItem.workQty" />
- <NumberField source="qty" label="table.field.stockItem.qty" />
- <TextField source="splrCode" label="table.field.stockItem.splrCode" />
- <TextField source="batch" label="table.field.stockItem.batch" />
- <TextField source="splrBatch" label="table.field.stockItem.splrBatch" />
- <TextField source="splrName" label="table.field.stockItem.splrName" />
- <TextField source="trackCode" label="table.field.stockItem.trackCode" />
- <TextField source="barcode" label="table.field.stockItem.barcode" />
- <TextField source="prodTime" label="table.field.stockItem.prodTime" />
- <TextField source="packName" label="table.field.stockItem.packName" />
- <TextField source="updateBy$" label="common.field.updateBy" />
- <DateField source="updateTime" label="common.field.updateTime" showTime />
- <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>
</Box>
</Grid>
@@ -215,3 +183,93 @@
<Button label={"toolbar.confirm"} variant="contained" color="primary" size="medium" startIcon={<SaveIcon />} onClick={confirmSelect} />
)
}
+
+
+const DynamicFields = (props) => {
+ const { setDrawerVal, setCreateDialog, setSelect, filters } = props
+ const translate = useTranslate();
+ const notify = useNotify();
+ const [columns, setColumns] = useState([]);
+ const { isLoading } = useListContext();
+ const refresh = useRefresh();
+ useEffect(() => {
+ 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="orderId" label="table.field.stockItem.orderId" />,
+ <TextField source="orderCode" label="table.field.stockItem.orderCode" />,
+ <TextField source="sourceItemId" label="table.field.stockItem.sourceItemId" />,
+ <TextField source="matnrId" label="table.field.stockItem.matnrId" />,
+ <TextField source="matnrCode" label="table.field.stockItem.matnrCode" />,
+ <TextField source="maktx" label="table.field.stockItem.maktx" />,
+ <NumberField source="anfme" label="table.field.stockItem.anfme" />,
+ <TextField source="stockUnit" label="table.field.stockItem.stockUnit" />,
+ <NumberField source="workQty" label="table.field.stockItem.workQty" />,
+ <NumberField source="qty" label="table.field.stockItem.qty" />,
+ <TextField source="splrCode" label="table.field.stockItem.splrCode" />,
+ <TextField source="batch" label="table.field.stockItem.batch" />,
+ <TextField source="splrBatch" label="table.field.stockItem.splrBatch" />,
+ <TextField source="splrName" label="table.field.stockItem.splrName" />,
+ <TextField source="trackCode" label="table.field.stockItem.trackCode" />,
+ <TextField source="barcode" label="table.field.stockItem.barcode" />,
+ <TextField source="prodTime" label="table.field.stockItem.prodTime" />,
+ <TextField source="packName" label="table.field.stockItem.packName" />,
+ ]
+ const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)
+ const lastArr = [
+ <TextField source="updateBy$" label="common.field.updateBy" />,
+ <DateField source="updateTime" label="common.field.updateTime" showTime />,
+ <TextField source="createBy$" label="common.field.createBy" />,
+ <DateField source="createTime" label="common.field.createTime" showTime />,
+ <TextField source="memo" label="common.field.memo" sortable={false} />,
+ ]
+ setColumns([...arr, ...fields, ...lastArr]);
+
+ data.map(el => {
+ var i = 0;
+ filters.map((item) => {
+ if (item.key === el.fields) {
+ i = 1;
+ }
+ })
+ i === 0 && filters.push(<TextInput key={el.fields} source={el.fields} label={el.fieldsAlise} />)
+ })
+ // setFilters([...filters, ...inputFields])
+
+ } else {
+ notify(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='stockHistories'
+ bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ rowClick={(id, resource, record) => false}
+ expand={false}
+ expandSingle={true}
+ omit={['id', 'createTime', 'orderId', 'sourceItemId', 'matnrId', 'createBy', 'barcode', 'splrCode', 'splrBatch', 'updateBy$', 'createBy$', 'memo']}
+ >
+ {columns.map((column) => column)}
+ </StyledDatagrid>}
+ </Box>
+ )
+}
--
Gitblit v1.9.1