From bfc43ca0e4683c1c0322a6cad5d5be2bc07decc3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 24 七月 2025 15:00:44 +0800
Subject: [PATCH] 新增调拔单功能 盘点功能优化
---
rsf-admin/src/page/orders/delivery/DeliveryList.jsx | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/rsf-admin/src/page/orders/delivery/DeliveryList.jsx b/rsf-admin/src/page/orders/delivery/DeliveryList.jsx
index 5a4eb4d..68ab69c 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';
@@ -56,12 +58,18 @@
'& .opt': {
width: 200
},
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
+
}));
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 +110,14 @@
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) }} />
<SelectColumnsButton preferenceKey='delivery' />
- <MyExportButton />
+ <ImportButton value={'delivery'} />
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
@@ -121,7 +128,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', 'platCode', 'memo', 'startTime', 'endTime', 'updateBy', 'createTime','createBy$']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.delivery.code" />
@@ -130,20 +137,20 @@
<TextField source="wkType$" label="table.field.delivery.wkType" />
<TextField source="source" label="table.field.delivery.source" />
<NumberField source="anfme" label="table.field.delivery.anfme" />
- <NumberField source="qty" label="table.field.delivery.qty" />
<NumberField source="workQty" label="table.field.delivery.workQty" />
+ <NumberField source="qty" label="table.field.delivery.qty" />
<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" />
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt">
<EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
- <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
+ <CustomDelteButton />
</WrapperField>
</StyledDatagrid>
</List>
@@ -161,4 +168,13 @@
)
}
+
+const CustomDelteButton = () => {
+ const record = useRecordContext();
+ return (
+ record?.exceStatus == 0 ? <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} /> : <></>
+ )
+}
+
+
export default DeliveryList;
--
Gitblit v1.9.1