From 73de15331cb383949ae5adc230b208a04d987b37 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 26 十二月 2025 14:23:43 +0800
Subject: [PATCH] Merge branch 'devlop-phyz' of http://47.97.1.152:5880/r/wms-master into devlop-phyz
---
rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
index 11ed2a0..30787ea 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
@@ -158,16 +158,24 @@
</>}
rowClick={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'logisNo', 'poId', 'rleStatus$', 'createBy$']}
+ omit={['id', 'code', 'poId', 'arrTime', 'createTime', 'createBy', 'memo', 'logisNo', 'updateBy$', 'updateTime', 'rleStatus$', 'createBy$']}
>
<NumberField source="id" />
- <TextField source="code" label="table.field.asnOrder.code" />
+ {/* <TextField source="code" label="table.field.asnOrder.code" /> */}
<TextField source="poCode" label="table.field.asnOrder.poCode" />
<NumberField source="poId" label="table.field.asnOrder.poId" />
<TextField source="type$" label="table.field.asnOrder.type" />
<TextField cellClassName="wkType" source="wkType$" label="table.field.asnOrder.wkType" />
<NumberField source="anfme" label="table.field.asnOrder.anfme" />
<NumberField source="qty" label="table.field.asnOrder.qty" />
+
+ {/* 閾跺骇鏂板 */}
+ <TextField source="purchaseOrgName" label="閲囪喘缁勭粐" />
+ <TextField source="purchaseUserName" label="閲囪喘鍛�" />
+ <TextField source="purchaseDate" label="閲囪喘鏃ユ湡" />
+ <TextField source="supplierId" label="渚涘簲鍟嗙紪鐮�" />
+ <TextField source="supplierName" label="渚涘簲鍟�" />
+
<DateField source="arrTime" label="table.field.asnOrder.arrTime" showTime />
<TextField source="rleStatus$" label="table.field.asnOrder.rleStatus" sortable={false} />
<TextField source="logisNo" label="table.field.asnOrder.logisNo" />
@@ -406,8 +414,6 @@
// </Button> : )
record.exceStatus === 1 ? <ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskIcon />} onConfirm={requestComplete} /> : <></>
)
-
-
}
const CloseButton = () => {
--
Gitblit v1.9.1