From 14f6548120b5d7f58ae2082454508a26ddac1db8 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 25 二月 2026 14:01:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-admin/src/page/orders/outStock/OutOrderList.jsx | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index 81563ec..a2ccae7 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -174,7 +174,7 @@
bulkActionButtons={<PublicTaskButton setWaveRule={setWaveRule} setSelectIds={setSelectIds} />}
rowClick={false}
expandSingle={true}
- omit={['id', 'code', 'createTime', 'createBy$', 'memo', 'rleStatus$', 'logisNo', 'updateBy$', 'workQty', 'updateTime']}
+ omit={['id', 'code', 'createTime', 'createBy$', 'memo', 'rleStatus$', 'logisNo', 'updateBy$', 'workQty', 'updateTime', 'type$']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.outStock.code" />
@@ -197,11 +197,12 @@
<TextField source="saleUserName" label="閿�鍞憳" />
<DateField source="businessTime" label="鍑哄簱鏃ユ湡" />
<TextField source="customerId" label="瀹㈡埛缂栫爜" />
- <TextField source="customerName" label="瀹㈡埛" />
+ <TextField source="customerName" label="瀹㈡埛" />
+ <TextField source="stockOrgName" label="table.field.outStock.stockOrgName" />
<BillStatusField cellClassName="status" source="exceStatus" label="table.field.outStock.exceStatus" />
<WrapperField cellClassName="opt" label="common.field.opt" >
- <MyButton setCreateDialog={setManualDialog} setmodalType={setmodalType} />
+ {/* <MyButton setCreateDialog={setManualDialog} setmodalType={setmodalType} /> */}
<EditButton label="toolbar.detail" icon={(<DetailsIcon />)}></EditButton>
<CancelButton />
<CompleteButton />
--
Gitblit v1.9.1