From 83207d8367cf5cdce0aedb5cf92b007ff9c7f7cd Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 18 四月 2025 13:28:38 +0800
Subject: [PATCH] #收货历史单明细导出问题修复
---
rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index 085e065..2e52eff 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -45,7 +45,6 @@
import PageDrawer from "../../components/PageDrawer";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, DEFAULT_ITEM_PAGE_SIZE } from '@/config/setting';
import AsnOrderItemEdit from "./AsnOrderItemEdit";
-import QrCodeIcon from "@mui/icons-material/QrCode";
import ImportButton from "../../components/ImportButton";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
@@ -65,7 +64,6 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
-
<NumberInput source="asnId" label="table.field.asnOrderItem.asnId" />,
<TextInput source="asnCode" label="table.field.asnOrderItem.asnCode" />,
<TextInput source="poDetlId" label="table.field.asnOrderItem.poDetlId" />,
@@ -80,9 +78,8 @@
<TextInput source="splrCode" label="table.field.asnOrderItem.splrCode" />,
<TextInput source="splrName" label="table.field.asnOrderItem.splrName" />,
<TextInput source="qrcode" label="table.field.asnOrderItem.qrcode" />,
- <TextInput source="barcode" label="table.field.asnOrderItem.barcode" />,
+ <TextInput source="trackCode" label="table.field.asnOrderItem.barcode" />,
<TextInput source="packName" label="table.field.asnOrderItem.packName" />,
-
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -102,7 +99,7 @@
const [drawerVal, setDrawerVal] = useState(false);
const [select, setSelect] = useState({});
const asnId = useGetRecordId();
- const { data: dicts, isPending, error } = useGetOne('asnOrder', { id: asnId }); const creatCode = () => { };
+ const { data: dicts, isPending, error } = useGetOne('asnOrder', { id: asnId });
return (
<>
@@ -119,18 +116,15 @@
}}
title={"menu.asnOrderItem"}
empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
- filter={{ asnId: asnId }}
+ filter={{ asnId: asnId, deleted: 0 }}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
- <Button onClick={creatCode} label={"toolbar.creatcode"}>
- <QrCodeIcon />
- </Button>
<FilterButton />
<MyCreateButton onClick={() => { setCreateDialog(true) }} />
<SelectColumnsButton preferenceKey='asnOrderItem' />
- <ImportButton value={'asnOrder'} parmas={{ asnId: asnId }} />
+ <ImportButton value={'asnOrderItem'} parmas={{ asnId: asnId }} />
<MyExportButton />
</TopToolbar>
)}
@@ -160,7 +154,7 @@
<TextField source="splrCode" label="table.field.asnOrderItem.splrCode" />
<TextField source="splrName" label="table.field.asnOrderItem.splrName" />
<TextField source="qrcode" label="table.field.asnOrderItem.qrcode" />
- <TextField source="barcode" label="table.field.asnOrderItem.barcode" />
+ <TextField source="trackCode" label="table.field.asnOrderItem.barcode" />
<TextField source="packName" label="table.field.asnOrderItem.packName" />
<TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
@@ -169,7 +163,6 @@
<BooleanField source="status$" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt">
- {/* <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} /> */}
<Button label="ra.action.edit" onClick={(id, resource, record) => {
setEditDialog(true)
setSelect(record) }} />
--
Gitblit v1.9.1