From 747c450bd0e2fe8b989e2ba514f35c58625b8a01 Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期五, 23 一月 2026 16:24:59 +0800
Subject: [PATCH] 库存字段顺序优化
---
rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx | 4 +-
rsf-admin/src/page/locPreview/LocPreviewItems.jsx | 20 ++++++----
rsf-admin/src/i18n/zh.js | 10 ++--
rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx | 21 +++++++---
rsf-admin/src/page/locPreview/LocPreviewEdit.jsx | 55 +++++++++++++--------------
5 files changed, 60 insertions(+), 50 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 0001eeb..97c034f 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -869,13 +869,13 @@
platItemId: '琛屽彿'
},
asnOrderLog: {
- code: "缂栫爜",
+ code: "鍗曟嵁缂栫爜",
poCode: "PO缂栫爜",
poId: "PO鏍囪瘑",
type: "鍗曟嵁绫诲瀷",
wkType: "涓氬姟绫诲瀷",
- anfme: "璁″垝鏁伴噺",
- qty: "宸插畬鎴愭暟閲�",
+ anfme: "搴旀敹鏁伴噺",
+ qty: "瀹炴敹鏁伴噺",
logisNo: "鐗╂祦鍗曞彿",
arrTime: "棰勮鍒拌揪鏃堕棿",
rleStatus: "閲婃斁鐘舵��",
@@ -1217,7 +1217,7 @@
matnrId: "鐗╂枡ID",
maktx: "鐗╂枡鍚嶇О",
unit: '鍗曚綅',
- anfme: '鏁伴噺',
+ anfme: '璁㈠崟鏁伴噺',
outQty: '璋冩暣鏁伴噺',
matnrCode: "鐗╂枡缂栫爜",
trackCode: "璺熻釜鐮�",
@@ -1225,7 +1225,7 @@
diffQty: '宸紓鏁伴噺',
reviseQty: '瀹為檯鏁伴噺',
deadTime: '鍋滅暀鏃堕棿锛堝ぉ锛�',
- qty: '瀹屾垚鏁�',
+ qty: '瀹屾垚鏁伴噺',
batch: "鎵规",
splrBatch: "鎵规",
spec: "瑙勬牸",
diff --git a/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx
index 8eb27ae..382bfa6 100644
--- a/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx
+++ b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx
@@ -148,7 +148,8 @@
rowClick={'edit'}
expand={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'logisNo', 'poId', 'rleStatus$', 'statusBool', 'createBy$']}
+ omit={['id', 'poId', 'arrTime', 'createTime', 'createBy', 'memo', 'logisNo', 'rleStatus$', 'createBy$', 'ntyStatus$',
+ 'poCode', 'type$']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.asnOrderLog.code" />
@@ -158,18 +159,26 @@
<TextField source="wkType$" label="table.field.asnOrderLog.wkType" />
<NumberField source="anfme" label="table.field.asnOrderLog.anfme" />
<NumberField source="qty" label="table.field.asnOrderLog.qty" />
- <TextField source="logisNo" label="table.field.asnOrderLog.logisNo" />
- <DateField source="arrTime" label="table.field.asnOrderLog.arrTime" showTime />
- <TextField source="rleStatus$" label="table.field.asnOrderLog.rleStatus" sortable={false} />
+ {/* <TextField source="logisNo" label="table.field.asnOrderLog.logisNo" /> */}
+ {/* <DateField source="arrTime" label="table.field.asnOrderLog.arrTime" showTime /> */}
+ {/* <TextField source="rleStatus$" label="table.field.asnOrderLog.rleStatus" sortable={false} /> */}
+ {/* 閾跺骇鏂板 */}
+ <TextField source="purchaseOrgName" label="閲囪喘缁勭粐" />
+ <TextField source="purchaseUserName" label="閲囪喘鍛�" />
+ <TextField source="purchaseDate" label="閲囪喘鏃ユ湡" />
+ <TextField source="supplierId" label="渚涘簲鍟嗙紪鐮�" />
+ <TextField source="supplierName" label="渚涘簲鍟�" />
+
<TextField source="ntyStatus$" label="table.field.asnOrderLog.ntyStatus" sortable={false} />
- <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 />
<BooleanField source="statusBool" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt">
- <ContinueButton />
+ <EditButton label="toolbar.detail"></EditButton>
+ {/* <ContinueButton /> */}
</WrapperField>
</StyledDatagrid>
</List>
diff --git a/rsf-admin/src/page/locPreview/LocPreviewEdit.jsx b/rsf-admin/src/page/locPreview/LocPreviewEdit.jsx
index 5033a64..424a37c 100644
--- a/rsf-admin/src/page/locPreview/LocPreviewEdit.jsx
+++ b/rsf-admin/src/page/locPreview/LocPreviewEdit.jsx
@@ -112,34 +112,6 @@
validate={required()}
readOnly
/>
- <NumberInput
- label="table.field.loc.length"
- source="length"
- readOnly
- />
-
- <NumberInput
- label="table.field.loc.width"
- source="width"
- readOnly
- />
-
- <NumberInput
- label="table.field.loc.height"
- source="height"
- readOnly
- />
- </Grid>
- <Grid item display="flex" gap={1}>
- <ReferenceArrayInput source="typeIds" reference="locType" >
- <SelectArrayInput label="table.field.loc.type" readOnly/>
- </ReferenceArrayInput>
- <TextInput
- label="table.field.loc.unit"
- source="unit"
- parse={v => v}
- readOnly
- />
<DictionarySelect
label={translate("table.field.loc.useStatus")}
name="useStatus"
@@ -148,13 +120,38 @@
dictTypeCode="sys_loc_use_stas"
readOnly
/>
+ {/* <ReferenceArrayInput source="typeIds" reference="locType" >
+ <SelectArrayInput label="table.field.loc.type" readOnly/>
+ </ReferenceArrayInput>
+ <TextInput
+ label="table.field.loc.unit"
+ source="unit"
+ parse={v => v}
+ readOnly
+ /> */}
+ </Grid>
+ <Grid item display="flex" gap={1}>
+ <NumberInput
+ label="table.field.loc.length"
+ source="length"
+ readOnly
+ />
+ <NumberInput
+ label="table.field.loc.width"
+ source="width"
+ readOnly
+ />
+ <NumberInput
+ label="table.field.loc.height"
+ source="height"
+ readOnly
+ />
<NumberInput
label="table.field.loc.row"
source="row"
validate={required()}
readOnly
/>
-
<NumberInput
label="table.field.loc.col"
source="col"
diff --git a/rsf-admin/src/page/locPreview/LocPreviewItems.jsx b/rsf-admin/src/page/locPreview/LocPreviewItems.jsx
index 0776a7b..920cebc 100644
--- a/rsf-admin/src/page/locPreview/LocPreviewItems.jsx
+++ b/rsf-admin/src/page/locPreview/LocPreviewItems.jsx
@@ -160,30 +160,32 @@
<NumberField source="locId" label="table.field.locItem.locId" />,
<TextField source="wareArea" label="table.field.locItem.wareArea" />,
<TextField source="locCode" label="table.field.locItem.locCode" />,
+ <NumberField source="wkType$" label="table.field.locItem.wkType" />,
+ <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
+ <TextField source="platItemId" label="table.field.asnOrderItem.platItemId" />,
<NumberField source="orderId" label="table.field.locItem.orderId" />,
<TextField source="type$" label="table.field.locItem.type" />,
- <NumberField source="orderItemId" label="table.field.locItem.orderItemId" />,
- <NumberField source="wkType$" label="table.field.locItem.wkType" />,
+ <NumberField source="orderItemId" label="table.field.locItem.orderItemId" />,
<NumberField source="matnrId" label="table.field.locItem.matnrId" />,
<TextField source="matnrCode" label="table.field.locItem.matnrCode" />,
<TextField source="maktx" label="table.field.locItem.maktx" />,
<TextField source="spec" label="table.field.locItem.spec" />,
<TextField source="model" label="table.field.locItem.model" />,
+ <TextField source="splrBatch" label="table.field.locItem.splrBatch" />,
<TextField source="batch" label="table.field.locItem.batch" />,
- <TextField source="trackCode" label="table.field.locItem.trackCode" />,
- <TextField source="unit" label="table.field.locItem.unit" />,
+ <TextField source="trackCode" label="table.field.locItem.trackCode" />,
<NumberField source="anfme" label="table.field.locItem.anfme" />,
<NumberField source="workQty" label="table.field.locItem.workQty" />,
<NumberField source="qty" label="table.field.locItem.qty" />,
- <TextField source="splrBatch" label="table.field.locItem.splrBatch" />,
+ <TextField source="unit" label="table.field.locItem.unit" />,
<TextField source="fieldsIndex" label="table.field.locItem.fieldsIndex" />,
]
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" />,
+ <TextField source="updateBy$" label="common.field.updateBy" />,
<DateField source="createTime" label="common.field.createTime" showTime />,
+ <TextField source="createBy$" label="common.field.createBy" />,
<BooleanField source="statusBool" label="common.field.status" sortable={false} />,
<TextField source="memo" label="common.field.memo" sortable={false} />,
]
@@ -213,7 +215,9 @@
rowClick={false}
expand={false}
expandSingle={true}
- omit={['id', 'createTime', 'spec', 'model', 'locId', 'orderId', 'trackCode', 'orderItemId', 'matnrId', 'splrBatch', 'createBy$', 'memo', 'fieldsIndex', 'statusBool']}
+ omit={['id', 'createTime', 'spec', 'model', 'locId', 'orderId', 'trackCode', 'orderItemId', 'matnrId', 'batch', 'createBy$', 'memo', 'fieldsIndex', 'statusBool', 'extendFields.[palletId]',
+ 'wareArea', 'locCode', 'type$', 'workQty', 'extendFields.[inStockType]', 'extendFields.[baseUnitId]', 'extendFields.[priceUnitId]', 'extendFields.[targetWareHouseId]', 'extendFields.[sourceWareHouseId]'
+ ]}
>
{columns.map((column) => column)}
</StyledDatagrid>}
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index 7062e5c..4cf419a 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -180,14 +180,14 @@
'businessTime', 'extendFields.[businessTime]',
'wkType', 'extendFields.[wkType]',
'type', 'extendFields.[type]',
- 'priceUnitId', 'purUnit', 'extendFields.[priceUnitId]',
+ 'priceUnitId', 'purUnit',
'id', 'orderId', 'orderCode', 'poCode', 'poId','wkType',
'type', 'checkType', 'spec', 'model', 'purQty', 'purUnit',
'qrcode', 'trackCode', 'splrCode', 'splrName', 'projectCode',
'supplierId', 'supplierName', 'shipperId',
// 'updateTime', 'updateBy', 'updateBy$',
'createTime', 'createBy', 'createBy$',
- 'extendFields.[inStockType]', 'extendFields.[baseUnitId]'
+ 'extendFields.[inStockType]', 'extendFields.[baseUnitId]', 'extendFields.[priceUnitId]'
];
const columns = result.columns.filter(col => !hiddenSources.includes(col.props.source));
setColumns(columns);
--
Gitblit v1.9.1