From c8fde8647b48e7c7d9b3beb6e8c39459f07c9eb2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 14:55:46 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx | 110 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 89 insertions(+), 21 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
index 1a1356a..0627434 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
@@ -11,6 +11,7 @@
CreateButton,
ExportButton,
BulkDeleteButton,
+ useDataProvider,
WrapperField,
useRecordContext,
useTranslate,
@@ -34,6 +35,7 @@
DeleteButton,
Button,
useRedirect,
+ useUnselectAll,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -45,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': {
@@ -106,18 +107,20 @@
]
-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 location = useLocation();
+ const notify = useNotify();
+ const refresh = useRefresh();
const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_business_type')) || [];
return (
<Box display="flex">
<List
+ resource="asnOrder"
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -127,14 +130,16 @@
marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.asnOrder"}
- empty={<EmptyData onClick={() => { setCreateDialog(true); setmodalType(0) }} />}
+ empty={false}
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>
)}
@@ -143,7 +148,14 @@
<StyledDatagrid
sx={{ width: '100%' }}
preferenceKey='asnOrder'
- bulkActionButtons={<> <InspectionsButton /><BulkDeleteButton mutationMode={OPERATE_MODE} /></>}
+ bulkActionButtons={
+ <>
+ <InspectionsButton />
+ <MyExportButton />
+ {/* <BtnBulkExport></BtnBulkExport> */}
+ <BulkDeleteButton mutationMode={OPERATE_MODE}
+ />
+ </>}
rowClick={false}
expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo', 'poId', 'rleStatus$']}
@@ -156,9 +168,10 @@
<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" />
+ {/* <TextField source="logisNo" label="table.field.asnOrder.logisNo" /> */}
<DateField source="arrTime" label="table.field.asnOrder.arrTime" showTime />
<TextField source="rleStatus$" label="table.field.asnOrder.rleStatus" sortable={false} />
+ <TextField source="ntyStatus$" label="table.field.asnOrder.ntyStatus" />
<TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
<TextField source="createBy$" label="common.field.createBy" />
@@ -170,7 +183,8 @@
<MyButton setCreateDialog={setCreateDialog} setmodalType={setmodalType} />
<InspectionButton />
<CompleteButton />
- <CloseButton />
+ <ODeleteButton />
+ {/* <CloseButton /> */}
</WrapperField>
</StyledDatagrid>
</List>
@@ -191,6 +205,14 @@
}
export default AsnOrderList;
+const ODeleteButton = () => {
+ const record = useRecordContext();
+ return (
+ record.exceStatus === 0 ? <DeleteButton mutationMode="pessimistic"/> : <></>
+ )
+
+}
+
const MyButton = ({ setCreateDialog, setmodalType }) => {
const record = useRecordContext();
const handleEditClick = (btn) => {
@@ -201,6 +223,7 @@
};
return (
+ record.exceStatus === 1 || record.exceStatus === 0 ?
<Button
color="primary"
startIcon={<EditIcon />}
@@ -209,9 +232,11 @@
label={'ra.action.edit'}
>
</Button>
+ : <></>
)
}
+//鎶ユ
const InspectionButton = () => {
const record = useRecordContext();
const notify = useNotify();
@@ -231,11 +256,8 @@
}
}
-
return (
- <Button onClick={inspection} label={"toolbar.inspection"}>
- <ConstructionIcon />
- </Button>
+ <ConfirmButton label={"toolbar.inspection"} color="secondary" startIcon={<ConstructionIcon />} onConfirm={inspection} />
)
}
@@ -243,10 +265,11 @@
const { selectedIds, onUnselectItems, data } = useListContext();
const notify = useNotify();
const refresh = useRefresh();
+ const translate = useTranslate();
const inspection = (btn) => {
btn.stopPropagation();
if (selectedIds.length === 0) {
- notify('璇烽�夋嫨閫氱煡鍗�');
+ notify(translate("request.error.select_error_order"));
return;
} else {
const rows = data.filter((item) => selectedIds.includes(item.id))
@@ -265,7 +288,6 @@
}
}
-
return (
<Button onClick={inspection} label={"toolbar.inspection"}>
<ConstructionIcon />
@@ -273,6 +295,53 @@
)
}
+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>
+ </>
+ )
+}
+
+//瀹屾垚鍗曟嵁
const CompleteButton = () => {
const record = useRecordContext();
const notify = useNotify();
@@ -288,12 +357,11 @@
}
}
-
return (
- record.exceStatus === 1 && (record.anfme === record.qty ? <Button onClick={requestComplete} label={"toolbar.complete"} color="success">
- <TaskIcon />
- </Button> : <ConfirmButton label={"toolbar.complete"} color="success" data={'褰撳墠鏀惰揣鏁伴噺灏忎簬璁″垝鏁伴噺锛屾槸鍚︾‘璁ゅ畬鎴�'} startIcon={<TaskIcon />} onConfirm={requestComplete} />)
-
+ // record.exceStatus === 1 && (record.anfme === record.qty ? <Button onClick={requestComplete} label={"toolbar.complete"} color="secondary">
+ // <TaskIcon />
+ // </Button> : )
+ record.exceStatus === 1 ? <ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskIcon />} onConfirm={requestComplete} /> : <></>
)
@@ -315,6 +383,6 @@
}
return (
- <ConfirmButton label={"toolbar.close"} color="error" data={'纭鏄惁鍏抽棴锛�'} startIcon={<CloseIcon />} onConfirm={requestClose} />
+ <ConfirmButton label={"toolbar.close"} color="error" startIcon={<CloseIcon />} onConfirm={requestClose} />
)
}
--
Gitblit v1.9.1