From 5074c51d978a490a1d0e9dc116a874d33ddeb16c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 04 六月 2025 13:22:03 +0800
Subject: [PATCH] DO单excel导入功能 任务工作档优化
---
rsf-admin/src/page/orders/delivery/DeliveryList.jsx | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/rsf-admin/src/page/orders/delivery/DeliveryList.jsx b/rsf-admin/src/page/orders/delivery/DeliveryList.jsx
index 5a4eb4d..4a5b27f 100644
--- a/rsf-admin/src/page/orders/delivery/DeliveryList.jsx
+++ b/rsf-admin/src/page/orders/delivery/DeliveryList.jsx
@@ -39,6 +39,8 @@
import EmptyData from "../../components/EmptyData";
import MyCreateButton from "../../components/MyCreateButton";
import MyExportButton from '../../components/MyExportButton';
+import ImportButton from "../../components/ImportButton";
+import BillStatusField from "../../components/BillStatusField";
import PageDrawer from "../../components/PageDrawer";
import MyField from "../../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
@@ -60,8 +62,8 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
- <DateInput label='common.time.after' source="timeStart" />,
- <DateInput label='common.time.before' source="timeEnd" />,
+ <DateInput label='common.time.after' source="timeStart" />,
+ <DateInput label='common.time.before' source="timeEnd" />,
<TextInput source="code" label="table.field.delivery.code" />,
<TextInput source="platId" label="table.field.delivery.platId" />,
<TextInput source="type" label="table.field.delivery.type" />,
@@ -102,15 +104,16 @@
marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.delivery"}
- empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ empty={false}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+ {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
<SelectColumnsButton preferenceKey='delivery' />
- <MyExportButton />
+ <ImportButton value={'delivery'} />
+ {/* <MyExportButton /> */}
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
@@ -121,7 +124,7 @@
rowClick={(id, resource, record) => false}
expand={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy','platId', 'memo', 'workQty', 'startTime', 'endTime', 'updateBy','createTime']}
+ omit={['id', 'createTime', 'createBy', 'platId', 'memo', 'workQty', 'startTime', 'endTime', 'updateBy', 'createTime']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.delivery.code" />
@@ -135,11 +138,12 @@
<TextField source="platCode" label="table.field.delivery.platCode" />
<DateField source="startTime" label="table.field.delivery.startTime" showTime />
<DateField source="endTime" label="table.field.delivery.endTime" showTime />
- <TextField source="updateBy$" label="common.field.updateBy" />
+ <TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
<TextField source="createBy$" label="common.field.createBy" />
<DateField source="createTime" label="common.field.createTime" showTime />
- <BooleanField source="statusBool" label="common.field.status" sortable={false} />
+ <BillStatusField cellClassName="status" source="exceStatus" label="table.field.asnOrder.exceStatus" />
+ {/* <BooleanField source="statusBool" 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' }} />
--
Gitblit v1.9.1