From 161e5e1c4e86ca59e945ddcdde9f7bf525f34911 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 05 八月 2025 13:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/orders/outStock/OutOrderList.jsx | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index 47f94a0..0e759e7 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -50,6 +50,7 @@
import ConfirmButton from '../../components/ConfirmButton';
import ImportButton from "../../components/ImportButton";
import DetailsIcon from '@mui/icons-material/Details';
+import OutStockWaveDialog from "./OutStockWaveDialog";
import AddTaskIcon from '@mui/icons-material/AddTask';
import PublicIcon from '@mui/icons-material/Public';
import SelectMatnrModal from "./SelectMatnrModal";
@@ -59,7 +60,6 @@
import OutStockPublic from "./OutStockPublic";
import OutOrderModal from "./OutOrderModal";
import request from '@/utils/request';
-import OutStockWaveDialog from "./OutStockWaveDialog";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -113,20 +113,20 @@
]
const OutOrderList = (props) => {
+
+ const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_business_type')) || [];
+ const [createDialog, setCreateDialog] = useState(false);
+ const [manualDialog, setManualDialog] = useState(false);
+ const [drawerVal, setDrawerVal] = useState(false);
+ const [waveRule, setWaveRule] = useState(false);
+ const [selectIds, setSelectIds] = useState([]);
+ const [preview, setPreview] = useState(false);
+ const [modalType, setmodalType] = useState(0);
+ const [select, setSelect] = useState(0);
const translate = useTranslate();
const refresh = useRefresh();
const notify = useNotify();
-
- const [createDialog, setCreateDialog] = useState(false);
- const [manualDialog, setManualDialog] = useState(false);
- const [selectIds, setSelectIds] = useState([]);
- const [preview, setPreview] = useState(false);
- const [waveRule, setWaveRule] = useState(false);
- const [drawerVal, setDrawerVal] = useState(false);
- const [modalType, setmodalType] = useState(0);
- const [select, setSelect] = useState(0);
const billReload = useRef();
- const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_business_type')) || [];
//鑾峰彇娉㈡瑙勫垯
const closeDialog = async (value) => {
@@ -222,7 +222,7 @@
drawerVal={drawerVal}
setDrawerVal={setDrawerVal}
>
- <OutStockPublic record={select} open={drawerVal} setOpen={setDrawerVal} />
+ <OutStockPublic record={select} open={drawerVal} setOpen={setDrawerVal} />
</PageEditDrawer>
</Box >
)
--
Gitblit v1.9.1