From 71725ae55cf54fa85be46f748528e2339643945c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 23 六月 2025 14:42:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/orders/stock/OrderList.jsx | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/page/orders/stock/OrderList.jsx b/rsf-admin/src/page/orders/stock/OrderList.jsx
index bfb26c5..bd7c9d8 100644
--- a/rsf-admin/src/page/orders/stock/OrderList.jsx
+++ b/rsf-admin/src/page/orders/stock/OrderList.jsx
@@ -116,18 +116,20 @@
bulkActionButtons={false}
rowClick='edit'
expandSingle={false}
- omit={['id', 'createTime','sourceId', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'sourceId', 'createBy', 'memo']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.stock.code" />
<TextField source="sourceCode" label="table.field.stock.sourceCode" />
<NumberField source="sourceId" label="table.field.stock.sourceId" />
+ <TextField source="locCode" label="table.field.locArea.locId" />,
+ <TextField source="barcode" label="table.field.task.barcode" />,
<TextField source="type$" label="table.field.stock.type" />
<TextField source="wkType$" label="table.field.stock.wkType" />
<NumberField source="anfme" label="table.field.stock.anfme" />
<TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
- <TextField source="createBy$" label="common.field.createBy" />
+ <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} />
--
Gitblit v1.9.1