From 8e622d6a1d07937cd654364748b52e15a50c67d8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 14 五月 2025 09:14:43 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/page/orders/purchase/PurchaseList.jsx |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rsf-admin/src/page/orders/purchase/PurchaseList.jsx b/rsf-admin/src/page/orders/purchase/PurchaseList.jsx
index 2a505de..fdfcc50 100644
--- a/rsf-admin/src/page/orders/purchase/PurchaseList.jsx
+++ b/rsf-admin/src/page/orders/purchase/PurchaseList.jsx
@@ -126,19 +126,19 @@
           rowClick={'edit'}
           expand={false}
           expandSingle={true}
-          omit={['id', 'createTime', 'createBy','channel', 'platCode', 'memo', 'preArr', 'channel','startTime','workQty', 'endTime']}
+          omit={['id', 'createTime', 'createBy','channel', 'platCode', 'memo', 'channel','startTime','workQty', 'endTime']}
         >
           <NumberField source="id" />
           <TextField source="code" label="table.field.purchase.code" />
           <TextField source="type$" label="table.field.purchase.type" />
           <TextField source="wkType$" label="table.field.purchase.wkType" />
           <TextField source="source" label="table.field.purchase.source" />
-          <DateField source="preArr" label="table.field.purchase.preArr" showTime />
           <NumberField source="anfme" label="table.field.purchase.anfme" />
           <NumberField source="qty" label="table.field.purchase.qty" />
           {/* <NumberField source="workQty" label="table.field.purchase.workQty" /> */}
           <TextField source="channel" label="table.field.purchase.channel" />
           <TextField source="platCode" label="table.field.purchase.platCode" />
+          <DateField source="preArr" label="table.field.purchase.preArr" showTime />
           <DateField source="startTime" label="table.field.purchase.startTime" showTime />
           <DateField source="endTime" label="table.field.purchase.endTime" showTime />
           <TextField source="project" label="table.field.purchase.project" />

--
Gitblit v1.9.1