From 3217d11481d7440f1526499d14a0c398369aa0e2 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 30 四月 2025 14:22:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/orders/outStock/OutOrderList.jsx | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index 2b181eb..267a114 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -51,7 +51,7 @@
import DictionarySelect from "../../components/DictionarySelect";
import ImportButton from "../../components/ImportButton";
import DetailsIcon from '@mui/icons-material/Details';
-import CancelIcon from '@mui/icons-material/Cancel';
+import CancelOutlinedIcon from '@mui/icons-material/CancelOutlined';
import OutOrderCreate from "./OutOrderCreate";
import AddIcon from '@mui/icons-material/Add';
import OutOrderModal from "./OutOrderModal";
@@ -266,14 +266,12 @@
return (
<Button onClick={createByOrder} label={'toolbar.asnCreate'}> <AddIcon /> </Button>
)
-
}
const CancelButton = () => {
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
-
const cancelOrder = async () => {
const { data: { code, data, msg } } = await request.get(`/outStock/cancel/${record?.id}`);
if (code === 200) {
@@ -285,6 +283,6 @@
}
return (
- <ConfirmButton label={"toolbar.cancel"} startIcon={<CancelIcon />} onConfirm={cancelOrder} />
+ record?.exceStatus == 0 ? <ConfirmButton label={"toolbar.cancel"} startIcon={<CancelOutlinedIcon /> } onConfirm={cancelOrder} /> : <></>
)
}
--
Gitblit v1.9.1