From 313e6ec716685ae4e55a4c6164790b1a31ee3e4d Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期一, 26 一月 2026 16:00:00 +0800
Subject: [PATCH] 订单明细字段顺序优化3
---
rsf-admin/src/page/orders/config/orderItemColumns.jsx | 2 +-
rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx | 8 ++++++--
rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx | 6 +++---
rsf-admin/src/page/locPreview/LocPreviewItems.jsx | 10 +++++-----
rsf-admin/src/page/waitPakin/WaitPakinEdit.jsx | 12 +++++++++---
rsf-admin/src/i18n/zh.js | 2 +-
6 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index af61524..930e634 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -1024,7 +1024,7 @@
matnrId: "鐗╂枡id",
matnrCode: "鐗╂枡缂栫爜",
asnId: "鏀惰揣閫氱煡鍗曞彿",
- asnCode: "鏀惰揣閫氱煡鍗曠紪鐮�",
+ asnCode: "鍗曟嵁缂栫爜",
asnItemId: "鏀惰揣閫氱煡鍗曟槑缁唅d",
trackCode: "鏉″舰鐮�",
isptResult: '璐ㄦ鐘舵��',
diff --git a/rsf-admin/src/page/locPreview/LocPreviewItems.jsx b/rsf-admin/src/page/locPreview/LocPreviewItems.jsx
index 88f662c..a557f14 100644
--- a/rsf-admin/src/page/locPreview/LocPreviewItems.jsx
+++ b/rsf-admin/src/page/locPreview/LocPreviewItems.jsx
@@ -161,11 +161,11 @@
<NumberField source="locId" label="table.field.locItem.locId" />,
<TextField source="wareArea" label="table.field.locItem.wareArea" />,
<TextField source="locCode" label="table.field.locItem.locCode" />,
- <OrderCodeField source="orderId" label="table.field.locItem.orderId" />,
+ <TextField source="type$" label="table.field.locItem.type" />,
<NumberField source="wkType$" label="table.field.locItem.wkType" />,
+ <OrderCodeField source="orderId" label="table.field.locItem.orderId" />,
<TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
<TextField source="platItemId" label="table.field.asnOrderItem.platItemId" />,
- <TextField source="type$" label="table.field.locItem.type" />,
<NumberField source="orderItemId" label="table.field.locItem.orderItemId" />,
<NumberField source="matnrId" label="table.field.locItem.matnrId" />,
<TextField source="matnrCode" label="table.field.locItem.matnrCode" />,
@@ -183,8 +183,8 @@
]
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 />,
- <TextField source="updateBy$" label="common.field.updateBy" />,
+ <TextField source="updateBy$" label="common.field.updateBy" />,
+ <DateField source="updateTime" label="common.field.updateTime" showTime />,
<DateField source="createTime" label="common.field.createTime" showTime />,
<TextField source="createBy$" label="common.field.createBy" />,
<BooleanField source="statusBool" label="common.field.status" sortable={false} />,
@@ -217,7 +217,7 @@
expand={false}
expandSingle={true}
omit={['id', 'createTime', 'spec', 'model', 'locId', 'trackCode', 'orderItemId', 'matnrId', 'batch', 'createBy$', 'memo', 'fieldsIndex', 'statusBool', 'extendFields.[palletId]',
- 'wareArea', 'locCode', 'type$', 'workQty', 'extendFields.[inStockType]', 'extendFields.[baseUnitId]', 'extendFields.[priceUnitId]', 'extendFields.[targetWareHouseId]', 'extendFields.[sourceWareHouseId]'
+ 'wareArea', 'locCode', 'workQty', 'extendFields.[inStockType]', 'extendFields.[baseUnitId]', 'extendFields.[priceUnitId]', 'extendFields.[targetWareHouseId]', 'extendFields.[sourceWareHouseId]'
]}
>
{columns.map((column) => column)}
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index 4cf419a..bac11a1 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -180,9 +180,9 @@
'businessTime', 'extendFields.[businessTime]',
'wkType', 'extendFields.[wkType]',
'type', 'extendFields.[type]',
- 'priceUnitId', 'purUnit',
+ 'priceUnitId',
'id', 'orderId', 'orderCode', 'poCode', 'poId','wkType',
- 'type', 'checkType', 'spec', 'model', 'purQty', 'purUnit',
+ 'type', 'checkType', 'spec', 'model', 'purQty',
'qrcode', 'trackCode', 'splrCode', 'splrName', 'projectCode',
'supplierId', 'supplierName', 'shipperId',
// 'updateTime', 'updateBy', 'updateBy$',
@@ -223,7 +223,7 @@
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',
+ 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)}
diff --git a/rsf-admin/src/page/orders/config/orderItemColumns.jsx b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
index 10d4b3f..8549e63 100644
--- a/rsf-admin/src/page/orders/config/orderItemColumns.jsx
+++ b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
@@ -43,7 +43,7 @@
<TextField source="maktx" label="table.field.asnOrderItem.maktx" key="maktx" />, //鐗╂枡鍚嶇О
<TextField source="splrBatch" label="table.field.asnOrderItem.splrBatch" key="splrBatch" />, //鎵规
<TextField source="spec" label="table.field.asnOrderItem.spec" key="spec" />, //瑙勬牸
- <TextField source="unit" label="table.field.asnOrderItem.unit" key="unit" />, //鍗曚綅
+ <TextField source="purUnit" label="table.field.asnOrderItem.unit" key="purUnit" />, //鍗曚綅
<NumberField source="anfme" label="table.field.asnOrderItem.anfme" key="anfme" />, //搴旀敹鏁伴噺
<NumberField source="qty" label="table.field.asnOrderItem.qty" key="qty" />, //瀹炴敹鏁伴噺
<TextField source="targetWarehouseId" label="table.field.asnOrderItem.targetWarehouseId" key="targetWarehouseId" />, //寤鸿鐩爣浠�
diff --git a/rsf-admin/src/page/waitPakin/WaitPakinEdit.jsx b/rsf-admin/src/page/waitPakin/WaitPakinEdit.jsx
index d74a5eb..3df4527 100644
--- a/rsf-admin/src/page/waitPakin/WaitPakinEdit.jsx
+++ b/rsf-admin/src/page/waitPakin/WaitPakinEdit.jsx
@@ -91,15 +91,21 @@
readOnly
source="anfme"
/>
- <SelectInput
+ <TextInput
label="table.field.waitPakin.ioStatus"
readOnly
- source="ioStatus"
+ source="ioStatus$"
+ parse={v => v}
+ />
+ {/* <SelectInput
+ label="table.field.waitPakin.ioStatus"
+ readOnly
+ source="ioStatus$"
choices={[
{ id: 0, name: '寰呭叆搴�' },
{ id: 1, name: ' 鍏ュ簱涓�' },
]}
- />
+ /> */}
</Stack>
</Grid>
</Grid>
diff --git a/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx b/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx
index 000d402..fafe8ff 100644
--- a/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx
+++ b/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx
@@ -157,15 +157,19 @@
const arr = [
<NumberField source="id" />,
<NumberField source="pakinId" label="table.field.waitPakinItem.pakinId" />,
+ <TextField source="type$" label="table.field.locItem.type" />,
+ <NumberField source="wkType$" label="table.field.locItem.wkType" />,
+ <TextField source="asnCode" label="table.field.waitPakinItem.asnCode" />,
+ // <OrderCodeField source="orderId" label="table.field.locItem.orderId" />,
<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="anfme" label="table.field.waitPakinItem.anfme" />,
- // <NumberField source="qty" label="table.field.waitPakinItem.qty" />,
<TextField source="unit" label="table.field.waitPakinItem.unit" />,
+ <NumberField source="anfme" label="table.field.waitPakinItem.anfme" />,
+ // <NumberField source="qty" label="table.field.waitPakinItem.qty" />,
<TextField source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
<TextField source="projectCode" label="table.field.asnOrderItem.projectCode" />,
<NumberField source="workQty" label="table.field.waitPakinItem.workQty" />,
--
Gitblit v1.9.1