From a6991a33e18f69264f93a63459a4b64ea799295a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 05 八月 2025 13:02:24 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/transfer/TransferOrders.jsx | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/rsf-admin/src/page/orders/transfer/TransferOrders.jsx b/rsf-admin/src/page/orders/transfer/TransferOrders.jsx
index 8d58600..be8eac0 100644
--- a/rsf-admin/src/page/orders/transfer/TransferOrders.jsx
+++ b/rsf-admin/src/page/orders/transfer/TransferOrders.jsx
@@ -11,6 +11,7 @@
WrapperField,
useRecordContext,
DatagridConfigurable,
+ useRedirect,
} from 'react-admin';
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting.js';
@@ -40,6 +41,7 @@
}));
const TransferOrders = () => {
+ const redirct = useRedirect();
const record = useRecordContext();
if (!record) return null;
const translate = useTranslate();
@@ -65,27 +67,31 @@
perPage={DEFAULT_PAGE_SIZE}
>
<StyledDatagrid
- sx={{ width: '100%' }}
+ sx={{ margin: 'auto', width: '100%' }}
preferenceKey='outStock'
bulkActionButtons={false}
- rowClick={false}
+ rowClick={(id, resource, record) => {
+ if (record.type == 'out') {
+ redirct("/outStock")
+ } else if (record.type == 'in') {
+ redirct("/asnOrder")
+ }
+ }}
expandSingle={true}
- omit={['id', 'createTime', 'createBy$', 'memo', 'rleStatus$']}
+ omit={['id', 'memo']}
>
<NumberField source="id" />
- <TextField source="code" label="table.field.outStock.code" />
- <TextField source="poCode" label="table.field.outStock.poCode" />
- <TextField source="type$" label="table.field.outStock.type" />
- <TextField cellClassName="wkType" source="wkType$" label="table.field.outStock.wkType" />
- <NumberField source="anfme" label="table.field.outStock.anfme" />
- <NumberField source="workQty" label="table.field.outStock.workQty" />
- <NumberField source="qty" label="table.field.outStock.qty" />
- <TextField source="logisNo" label="table.field.outStock.logisNo" />
- <TextField source="rleStatus$" label="table.field.outStock.rleStatus" sortable={false} />
- <TextField source="updateBy$" label="common.field.updateBy" />
- <DateField source="updateTime" label="common.field.updateTime" showTime />
+ <TextField source="code" label="table.field.transferOrder.code"/>
+ <TextField source="poCode" label="table.field.transferOrder.poCode" />
+ <TextField source="type$" label="table.field.transferOrder.type" />
+ <TextField cellClassName="wkType" source="wkType$" label="table.field.transferOrder.wkType" />
+ <NumberField source="anfme" label="table.field.transferOrder.anfme" />
+ <NumberField source="workQty" label="table.field.transferOrder.workQty" />
+ <NumberField source="qty" label="table.field.transferOrder.qty" />
<TextField source="createBy$" label="common.field.createBy" />
+ <TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="createTime" label="common.field.createTime" showTime />
+ <DateField source="updateTime" label="common.field.updateTime" showTime />
<BillStatusField cellClassName="status" source="exceStatus" label="table.field.outStock.exceStatus" />
<TextField source="memo" label="common.field.memo" sortable={false} />
</StyledDatagrid>
--
Gitblit v1.9.1