From d2ea33b96cb1394b5546b1bfc557c1c984e4bc5b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 四月 2025 12:36:50 +0800
Subject: [PATCH] 出库单明细功能优化
---
rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx | 108 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 83 insertions(+), 25 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
index ccd61f5..aca166f 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
@@ -1,5 +1,5 @@
import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
-import { useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
import {
List,
DatagridConfigurable,
@@ -11,6 +11,7 @@
CreateButton,
ExportButton,
BulkDeleteButton,
+ useDataProvider,
WrapperField,
useRecordContext,
useTranslate,
@@ -33,6 +34,8 @@
AutocompleteInput,
DeleteButton,
Button,
+ useRedirect,
+ useUnselectAll,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -44,16 +47,15 @@
import BillStatusField from '../../components/BillStatusField';
import ConfirmButton from '../../components/ConfirmButton';
import PageDrawer from "../../components/PageDrawer";
-import MyField from "../../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
-import * as Common from '@/utils/common';
import ConstructionIcon from "@mui/icons-material/Construction";
-import FileDownloadIcon from '@mui/icons-material/FileDownload';
import EditIcon from '@mui/icons-material/Edit';
import TaskIcon from '@mui/icons-material/Task';
import CloseIcon from '@mui/icons-material/Close';
import request from '@/utils/request';
import DictionarySelect from "../../components/DictionarySelect";
+import ExitToAppIcon from '@mui/icons-material/ExitToApp';
+import ImportButton from "../../components/ImportButton";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -65,10 +67,13 @@
'& .column-name': {
},
'& .opt': {
- width: 320
+ width: 220
+ },
+ '& .wkType': {
+ width: 110
},
'& .status': {
- width: 100
+ width: 90
},
}));
@@ -78,7 +83,7 @@
<TextInput source="poCode" label="table.field.asnOrder.poCode" />,
<NumberInput source="poId" label="table.field.asnOrder.poId" />,
<TextInput source="type" label="table.field.asnOrder.type" />,
- <ReferenceInput source="wkType" reference="dictData" filter={{dictTypeCode: 'sys_business_type'}} label="table.field.asnOrder.wkType">
+ <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_business_type' }} label="table.field.asnOrder.wkType">
<AutocompleteInput label="table.field.asnOrder.wkType" optionValue="value" />
</ReferenceInput>,
<NumberInput source="anfme" label="table.field.asnOrder.anfme" />,
@@ -102,21 +107,18 @@
]
-const AsnOrderList = () => {
+const AsnOrderList = (props) => {
const translate = useTranslate();
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
const [modalType, setmodalType] = useState(0);
+ const [select, setSelect] = useState(0);
const billReload = useRef();
- const navigate = useNavigate();
const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_business_type')) || [];
- const assign = (record) => {
- navigate(`/asnOrderItem?asnId=${record.id}`);
- };
-
return (
<Box display="flex">
<List
+ resource="asnOrder"
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -128,12 +130,14 @@
title={"menu.asnOrder"}
empty={<EmptyData onClick={() => { setCreateDialog(true); setmodalType(0) }} />}
filters={filters}
+ filter={{deleted: 0}}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
<MyCreateButton onClick={() => { setCreateDialog(true); setmodalType(0) }} />
<SelectColumnsButton preferenceKey='asnOrder' />
+ <ImportButton value={'asnOrderItem'} />
<MyExportButton />
</TopToolbar>
)}
@@ -142,17 +146,24 @@
<StyledDatagrid
sx={{ width: '100%' }}
preferenceKey='asnOrder'
- bulkActionButtons={<> <InspectionsButton /><BulkDeleteButton mutationMode={OPERATE_MODE} /></>}
- rowClick={() => 'edit'}
+ bulkActionButtons={
+ <>
+ <InspectionsButton />
+ <MyExportButton />
+ {/* <BtnBulkExport></BtnBulkExport> */}
+ <BulkDeleteButton mutationMode={OPERATE_MODE}
+ />
+ </>}
+ rowClick={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'poId']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'poId', 'rleStatus$']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.asnOrder.code" />
<TextField source="poCode" label="table.field.asnOrder.poCode" />
<NumberField source="poId" label="table.field.asnOrder.poId" />
<TextField source="type$" label="table.field.asnOrder.type" />
- <TextField source="wkType$" label="table.field.asnOrder.wkType" />
+ <TextField cellClassName="wkType" source="wkType$" label="table.field.asnOrder.wkType" />
<NumberField source="anfme" label="table.field.asnOrder.anfme" />
<NumberField source="qty" label="table.field.asnOrder.qty" />
<TextField source="logisNo" label="table.field.asnOrder.logisNo" />
@@ -164,7 +175,8 @@
<DateField source="createTime" label="common.field.createTime" showTime />
<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" width={300} >
+ <WrapperField cellClassName="opt" label="common.field.opt" >
+ <EditButton label="toolbar.detail"></EditButton>
<MyButton setCreateDialog={setCreateDialog} setmodalType={setmodalType} />
<InspectionButton />
<CompleteButton />
@@ -191,7 +203,8 @@
const MyButton = ({ setCreateDialog, setmodalType }) => {
const record = useRecordContext();
- const handleEditClick = () => {
+ const handleEditClick = (btn) => {
+ btn.stopPropagation();
const id = record.id;
setmodalType(id);
setCreateDialog(true);
@@ -201,7 +214,7 @@
<Button
color="primary"
startIcon={<EditIcon />}
- onClick={() => handleEditClick()}
+ onClick={(btn) => handleEditClick(btn)}
sx={{ ml: 1 }}
label={'ra.action.edit'}
>
@@ -213,13 +226,13 @@
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
- const inspection = () => {
+ const inspection = (btn) => {
+ btn.stopPropagation();
requestInspect([record])
};
const requestInspect = async (rows) => {
const { data: { code, data, msg } } = await request.post(`/asnOrder/inspect`, rows);
-
if (code === 200) {
notify(msg);
refresh()
@@ -240,7 +253,8 @@
const { selectedIds, onUnselectItems, data } = useListContext();
const notify = useNotify();
const refresh = useRefresh();
- const inspection = () => {
+ const inspection = (btn) => {
+ btn.stopPropagation();
if (selectedIds.length === 0) {
notify('璇烽�夋嫨閫氱煡鍗�');
return;
@@ -261,11 +275,56 @@
}
}
-
return (
<Button onClick={inspection} label={"toolbar.inspection"}>
<ConstructionIcon />
</Button>
+ )
+}
+
+const BtnBulkExport = () => {
+ const { filter, selectedIds, filterValues, resource, sort, total } = useListContext();
+ const refresh = useRefresh();
+ const dataProvider = useDataProvider();
+ const notify = useNotify();
+ const unSelect = useUnselectAll(resource);
+
+ const bulkExport = () => {
+ getExport()
+ unSelect();
+ }
+ const getExport = () => {
+ dataProvider
+ .export(resource, {
+ ids: selectedIds,
+ pagination: { page: 1, perPage: 1000 },
+ })
+ .then((res) => {
+ const url = window.URL.createObjectURL(
+ new Blob([res.data], { type: res.headers["content-type"] }),
+ );
+ const link = document.createElement("a");
+ link.href = url;
+ link.setAttribute("download", `${resource}.xlsx`);
+ document.body.appendChild(link);
+ link.click();
+ link.remove();
+ })
+ .catch((error) => {
+ console.error(error);
+ notify("ra.notification.http_error", { type: "error" });
+ });
+ if (typeof onClick === "function") {
+ onClick(event);
+ }
+ };
+
+ return (
+ <>
+ <Button label="toolbar.bulkExport" onClick={bulkExport}>
+ <ExitToAppIcon />
+ </Button>
+ </>
)
}
@@ -283,7 +342,6 @@
notify(msg);
}
}
-
return (
record.exceStatus === 1 && (record.anfme === record.qty ? <Button onClick={requestComplete} label={"toolbar.complete"} color="success">
--
Gitblit v1.9.1