From 48b45b5e63f9925c63c951093c4cf596d89683a2 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 11 八月 2025 10:34:22 +0800
Subject: [PATCH] #
---
rsf-admin/src/page/orders/outStock/OutOrderModal.jsx | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
index 229b284..d64d8a3 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
@@ -39,15 +39,17 @@
useRefresh,
useGetList,
} from 'react-admin';
-import DialogCloseButton from "../../components/DialogCloseButton";
-import { styled } from '@mui/material/styles';
+
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
-import { Grid, margin, Stack, width } from "@mui/system";
-import request from '@/utils/request';
-import SaveIcon from '@mui/icons-material/Save';
-import CheckCircleIcon from '@mui/icons-material/CheckCircle';
+import DialogCloseButton from "../../components/DialogCloseButton";
import EditableTextField from "../../components/EditableTextField";
+import CheckCircleIcon from '@mui/icons-material/CheckCircle';
+import { Grid, margin, Stack, width } from "@mui/system";
+import SaveIcon from '@mui/icons-material/Save';
import OutOrderPreview from "./OutOrderPreview";
+import { styled } from '@mui/material/styles';
+import request from '@/utils/request';
+
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -93,18 +95,17 @@
const OutOrderModal = (props) => {
const { open, setOpen, preview, setPreview, record } = props;
- const translate = useTranslate();
+ const [drawerVal, setDrawerVal] = useState(false);
const [params, setParams] = useState({});
const [select, setSelect] = useState([]);
-
- const [drawerVal, setDrawerVal] = useState(false);
+ const translate = useTranslate();
const refresh = useRefresh();
-
const handleClose = (event, reason) => {
if (reason !== "backdropClick") {
setOpen(false);
}
};
+
const CustomFilter = () => {
const { filterValues, setFilters, refetch } = useListContext();
const [formValues, setFormValues] = useState(filterValues);
@@ -225,11 +226,11 @@
/>
<StyledDatagrid
preferenceKey='deliveryItem'
- bulkActionButtons={<AddOutStockButton setOpen={setOpen} setPreview={setPreview} setSelect={setSelect}/>}
+ bulkActionButtons={<AddOutStockButton setOpen={setOpen} setPreview={setPreview} setSelect={setSelect} />}
rowClick={(id, resource, record) => false}
expand={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'workQty', 'startTime', 'endTime', 'updateBy', 'createTime']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'startTime', 'endTime', 'updateBy', 'createTime']}
>
<NumberField source="id" />
<TextField source="deliveryCode" label="table.field.deliveryItem.deliveryCode" />
@@ -237,6 +238,7 @@
<TextField source="maktx" label="table.field.deliveryItem.matnrName" />
<TextField source="unit" label="table.field.deliveryItem.unit" />
<NumberField source="anfme" label="table.field.deliveryItem.anfme" />
+ <NumberField source="workQty" label="table.field.outStockItem.workQty" />
<TextField source="splrName" label="table.field.deliveryItem.splrName" />
<TextField source="splrBatch" label="table.field.deliveryItem.splrBatch" />
<TextField source="updateBy$" label="common.field.updateBy" />
@@ -252,7 +254,7 @@
</DialogContent>
</Grid>
<Grid>
- <OutOrderPreview open={preview} setOpen={setPreview} selectedIds={select} />
+ <OutOrderPreview open={preview} setOpen={setPreview} selectedIds={select} setCloseParent={setOpen} />
</Grid>
</Dialog >
)
@@ -266,12 +268,6 @@
const notify = useNotify();
const refresh = useRefresh();
const confirm = async (event) => {
- const res = await request.post(`/outStock/generate/orders`, { ids: selectedIds });
- if (res?.data?.code === 200) {
- notify(res.data.msg);
- } else {
- notify(res.data.msg);
- }
setPreview(true)
setSelect(selectedIds);
onUnselectItems();
--
Gitblit v1.9.1