From 314c7fb1e63eec344895e95a1a7ce4ad00ca9525 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期四, 22 一月 2026 09:43:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx | 54 +++++-------------------------------------------------
1 files changed, 5 insertions(+), 49 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index f6588e0..94f1c29 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': {
@@ -172,56 +173,11 @@
}, []);
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.asnOrderItem.orderId" />,
- <TextField source="orderCode" label="table.field.asnOrderItem.orderCode" />,
- <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="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
- <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
- <TextField source="projectCode" label="table.field.asnOrderItem.projectCode" />,
- <TextField source="spec" label="table.field.asnOrderItem.spec" />,
- <TextField source="model" label="table.field.asnOrderItem.model" />,
- <NumberField source="anfme" label="table.field.asnOrderItem.anfme" />,
- <NumberField source="qty" label="table.field.asnOrderItem.qty" />,
- <TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" />,
- <NumberField source="purQty" label="table.field.asnOrderItem.purQty" />,
- <TextField source="purUnit" label="table.field.asnOrderItem.purUnit" />,
- <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" />,
-
- // 閾跺骇鏂板
- <TextField source="trackCode" label="浠撳簱" />,
- <TextField source="trackCode" label="琛屽唴鍙�" />,
- <TextField source="packName" label="璁″垝璺熻釜鍙�" />,
- ]
- 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]);
+ const result = await fetchInOrderItemColumns();
+ if (result.success) {
+ setColumns(result.columns);
} else {
- notify(msg);
+ notify(result.msg);
}
}
--
Gitblit v1.9.1