From 05415ac7b38c1dc579ad0f1b11449575dccf20e4 Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期五, 23 一月 2026 15:00:40 +0800
Subject: [PATCH] 组托字段顺序优化
---
rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx | 17 ++++++++++-------
rsf-admin/src/page/waitPakin/WaitPakinList.jsx | 4 ++--
rsf-admin/src/i18n/zh.js | 6 +++---
3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 67286e3..0001eeb 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -1018,7 +1018,7 @@
},
waitPakinItem: {
pakinId: "缁勬墭Id",
- maktx: "鐗╂枡",
+ maktx: "鐗╂枡鍚嶇О",
matnrId: "鐗╂枡id",
matnrCode: "鐗╂枡缂栫爜",
asnId: "鏀惰揣閫氱煡鍗曞彿",
@@ -1026,11 +1026,11 @@
asnItemId: "鏀惰揣閫氱煡鍗曟槑缁唅d",
trackCode: "鏉″舰鐮�",
isptResult: '璐ㄦ鐘舵��',
- anfme: "鏁伴噺",
+ anfme: "搴旀敹鏁伴噺",
workQty: "鎵ц涓暟閲�",
unit: "鍗曚綅",
fieldsIndex: "鎵╁睍瀛楁鍞竴鏍囪瘑",
- qty: "宸插畬鎴�",
+ qty: "瀹炴敹鏁伴噺",
batch: "鎵规",
},
waitPakinLog: {
diff --git a/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx b/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx
index 8561354..b8e22d0 100644
--- a/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx
+++ b/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx
@@ -158,23 +158,24 @@
<NumberField source="id" />,
<NumberField source="pakinId" label="table.field.waitPakinItem.pakinId" />,
<TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
+ <TextField source="platItemId" label="table.field.deliveryItem.platItemId" />,
+ <NumberField source="matnrId" label="table.field.waitPakinItem.matnrId" />,
<TextField source="matnrCode" label="table.field.waitPakinItem.matnrCode" />,
<TextField source="maktx" label="table.field.waitPakinItem.maktx" />,
<TextField source="batch" label="table.field.waitPakinItem.batch" />,
- <NumberField source="matnrId" label="table.field.waitPakinItem.matnrId" />,
<NumberField source="anfme" label="table.field.waitPakinItem.anfme" />,
+ <NumberField source="qty" label="table.field.waitPakinItem.qty" />,
<TextField source="unit" label="table.field.waitPakinItem.unit" />,
<TextField source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
<TextField source="projectCode" label="table.field.asnOrderItem.projectCode" />,
- <NumberField source="workQty" label="table.field.waitPakinItem.workQty" />,
- <NumberField source="qty" label="table.field.waitPakinItem.qty" />,
- <TextField source="fieldsIndex" label="table.field.waitPakinItem.fieldsIndex" />,
- <TextField source="isptResult$" label="table.field.waitPakinItem.isptResult" />,
+ <NumberField source="workQty" label="table.field.waitPakinItem.workQty" />,
+ // <TextField source="fieldsIndex" label="table.field.waitPakinItem.fieldsIndex" />,
+ // <TextField source="isptResult$" label="table.field.waitPakinItem.isptResult" />,
]
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="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} />,
@@ -203,7 +204,9 @@
preferenceKey='waitPakinItem'
bulkActionButtons={false}
rowClick={(id, resource, record) => false}
- omit={['id', 'pakinId', 'createTime', 'matnrId', 'createBy', 'memo', 'fieldsIndex', 'projectCode']} //'platWorkCode',
+ omit={['id', 'pakinId', 'createTime', 'matnrId', 'createBy', 'memo', 'fieldsIndex', 'projectCode', 'fieldsIndex', 'platOrderCode', 'workQty', 'isptResult$',
+ 'createBy$', 'createTime', 'extendFields.[baseUnitId]', 'extendFields.[priceUnitId]', 'extendFields.[inStockType]'
+ ]} //'platWorkCode',
>
{columns.map((column) => column)}
</StyledDatagrid>}
diff --git a/rsf-admin/src/page/waitPakin/WaitPakinList.jsx b/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
index e63471c..4e75e77 100644
--- a/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
+++ b/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
@@ -179,8 +179,8 @@
<TextField source="barcode" label="table.field.waitPakin.barcode" />
<NumberField source="anfme" label="table.field.waitPakin.anfme" />
<TextField source="ioStatus$" label="table.field.waitPakin.ioStatus" sortable={false} />
- <TextField source="updateBy$" label="common.field.updateBy" />
- <DateField source="updateTime" label="common.field.updateTime" showTime />
+ <DateField source="updateTime" label="common.field.updateTime" showTime />
+ <TextField source="updateBy$" label="common.field.updateBy" />
<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} />
--
Gitblit v1.9.1