From 9140aee230de0ef41de9682a9353fbd372e2bcaa Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期二, 03 三月 2026 13:43:22 +0800
Subject: [PATCH] 云仓WMS接口
---
rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogShow.jsx | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogShow.jsx b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogShow.jsx
index 6ba1720..2acd903 100644
--- a/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogShow.jsx
+++ b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogShow.jsx
@@ -1,12 +1,27 @@
import { BooleanField, DateField, NumberField, ReferenceField, Show, SimpleShowLayout, TextField ,DateInput,
SelectInput,required,useTranslate,
useRecordContext,} from 'react-admin';
- import { Stack, Grid, Box, Typography, Card } from '@mui/material';
- import { EDIT_MODE, REFERENCE_INPUT_PAGESIZE } from '@/config/setting';
- import EditBaseAside from "../../components/EditBaseAside";
- import CustomerTopToolBar from "../../components/EditTopToolBar";
- import AsnOrderItemLogList from "./AsnOrderItemLogList"
+import { Stack, Grid, Box, Typography, Card } from '@mui/material';
+import { EDIT_MODE, REFERENCE_INPUT_PAGESIZE } from '@/config/setting';
+import EditBaseAside from "../../components/EditBaseAside";
+import CustomerTopToolBar from "../../components/EditTopToolBar";
+import AsnOrderItemLogList from "./AsnOrderItemLogList";
+const AsnOrderLogDetailWithItems = () => {
+ const record = useRecordContext();
+ const translate = useTranslate();
+ if (!record?.id) return null;
+ return (
+ <>
+ <Grid item xs={24} md={16} sx={{ marginTop: '1em', width: '100%' }}>
+ <Typography variant="h6" gutterBottom>
+ {translate('common.edit.title.common')}
+ </Typography>
+ </Grid>
+ <AsnOrderItemLogList logId={record.id} />
+ </>
+ );
+};
const Aa = () =>{
const translate = useTranslate();
@@ -22,7 +37,6 @@
<SimpleShowLayout
shouldUnregister
warnWhenUnsavedChanges
-
mode="onTouched"
defaultValues={{}}
>
@@ -113,28 +127,23 @@
<DateField source="arrTime" label="type" showTime/>
</Box>
</Grid>
- <Grid item display="flex" gap={1} minWidth={150}>
+ {/* 璐ㄦ涓婃姤鐘舵��
+ <Grid item display="flex" gap={1} minWidth={150}>
<Box flexGrow={1}>
<Typography variant="body2" sx={{fontSize: 20}}>
{translate('table.field.asnOrderLog.ntyStatus')}
</Typography>
<TextField source="ntyStatus$" label="type"/>
</Box>
- </Grid>
+ </Grid>
+ */}
</Stack>
</Grid>
</Grid>
-
+ <AsnOrderLogDetailWithItems />
</SimpleShowLayout>
</Show>
- <Grid item xs={24} md={16} sx={{ marginTop: '1em' }}>
- <Typography variant="h6" gutterBottom >
- {translate('common.edit.title.common')}
- </Typography>
- </Grid>
- <AsnOrderItemLogList />
</>
-
);
}
--
Gitblit v1.9.1