From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 16:35:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/check/CheckOrderList.jsx | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/page/orders/check/CheckOrderList.jsx b/rsf-admin/src/page/orders/check/CheckOrderList.jsx
index 4ab39dc..196c94d 100644
--- a/rsf-admin/src/page/orders/check/CheckOrderList.jsx
+++ b/rsf-admin/src/page/orders/check/CheckOrderList.jsx
@@ -24,6 +24,7 @@
ReferenceInput,
AutocompleteInput,
Button,
+ BulkDeleteButton,
useRedirect,
} from 'react-admin';
import { styled } from '@mui/material/styles';
@@ -39,7 +40,6 @@
import AddTaskIcon from '@mui/icons-material/AddTask';
import PublicIcon from '@mui/icons-material/Public';
import SelectMatnrModal from "./SelectMatnrModal";
-import CheckOrderModal from "./CheckOrderModal";
import EditIcon from '@mui/icons-material/Edit';
import AddIcon from '@mui/icons-material/Add';
import request from '@/utils/request';
@@ -141,7 +141,7 @@
>
<StyledDatagrid
preferenceKey='check'
- bulkActionButtons={<PublicTaskButton setWaveRule={setWaveRule} setSelectIds={setSelectIds} />}
+ bulkActionButtons={() => <BulkDeleteButton mutationMode="pessimistic"/>}
rowClick={false}
expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo', 'rleStatus$']}
@@ -236,7 +236,7 @@
const notify = useNotify();
const refresh = useRefresh();
const cancelOrder = async () => {
- const { data: { code, data, msg } } = await request.get(`/outStock/cancel/${record?.id}`);
+ const { data: { code, data, msg } } = await request.get(`/check/cancel/${record?.id}`);
if (code === 200) {
notify(msg);
refresh()
@@ -246,7 +246,7 @@
}
return (
- record?.exceStatus == 10 ? <ConfirmButton label={"toolbar.cancel"} startIcon={<CancelOutlinedIcon />} onConfirm={cancelOrder} size={"small"} /> : <></>
+ record?.exceStatus == 0 ? <ConfirmButton label={"toolbar.cancel"} startIcon={<CancelOutlinedIcon />} onConfirm={cancelOrder} size={"small"} /> : <></>
)
}
--
Gitblit v1.9.1