From e34c0f4e7379d97f1717acab4630020741ec2569 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 18 四月 2025 12:54:35 +0800
Subject: [PATCH] #初始化库位优化
---
rsf-admin/src/page/basicInfo/loc/InitModal.jsx | 10 ++++++----
rsf-admin/src/page/basicInfo/loc/LocListAside.jsx | 2 +-
rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx | 6 ++++--
rsf-admin/src/page/basicInfo/loc/LocList.jsx | 11 ++++++-----
4 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/loc/InitModal.jsx b/rsf-admin/src/page/basicInfo/loc/InitModal.jsx
index 7d7ee4b..8704732 100644
--- a/rsf-admin/src/page/basicInfo/loc/InitModal.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/InitModal.jsx
@@ -58,14 +58,15 @@
const InitModal = ({ open, setOpen }) => {
const refresh = useRefresh();
const translate = useTranslate();
-
+ const {filterValues} = useListContext(); // 鑾峰彇鍒楄〃涓婁笅鏂�
+
const notify = useNotify();
const [disabled, setDisabled] = useState(false)
const [formData, setFormData] = useState({
- "warehouseId": null,
- "areaId": undefined,
+ "warehouseId": filterValues.warehouseId,
+ "areaId": filterValues.areaId,
"endBay": undefined,
"endLev": undefined,
"endRow": undefined,
@@ -109,7 +110,7 @@
return (
<Dialog open={open} maxWidth="md" fullWidth>
- <Form onSubmit={handleSubmit}>
+ <Form onSubmit={handleSubmit} defaultValues={filterValues}>
<DialogCloseButton onClose={handleClose} />
<DialogTitle>{translate('toolbar.locInit')}</DialogTitle>
<DialogContent sx={{ mt: 2 }}>
@@ -121,6 +122,7 @@
reference="warehouse"
>
<AutocompleteInput
+ debounce
label="table.field.loc.warehouseId"
optionText="name"
onChange={(value) => handleChange(value, 'warehouseId')}
diff --git a/rsf-admin/src/page/basicInfo/loc/LocList.jsx b/rsf-admin/src/page/basicInfo/loc/LocList.jsx
index 1d2618a..a319484 100644
--- a/rsf-admin/src/page/basicInfo/loc/LocList.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/LocList.jsx
@@ -251,6 +251,10 @@
</WrapperField>
</StyledDatagrid>
+ <InitModal
+ open={initDialog}
+ setOpen={setInitDialog}
+ />
</List>
<LocCreate
open={createDialog}
@@ -262,11 +266,8 @@
setDrawerVal={setDrawerVal}
>
</PageDrawer>
-
- <InitModal
- open={initDialog}
- setOpen={setInitDialog}
- />
+
+
</Box>
)
}
diff --git a/rsf-admin/src/page/basicInfo/loc/LocListAside.jsx b/rsf-admin/src/page/basicInfo/loc/LocListAside.jsx
index 4875166..63b310a 100644
--- a/rsf-admin/src/page/basicInfo/loc/LocListAside.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/LocListAside.jsx
@@ -67,7 +67,7 @@
if (row.flagWare === 1) {
setFilters({ warehouseId: row.id, areaId: '' });
} else if (row.flagWare === 0) {
- setFilters({ areaId: row.id, warehouseId: '' });
+ setFilters({ areaId: row.id, warehouseId: row.warehouseId });
}
};
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
index 97f66bd..1dab7ad 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
@@ -318,7 +318,8 @@
getOptions();
}, []);
const getOptions = async () => {
- const parmas = {
+ const parmas = {
+ "type": "supplier"
}
const {
data: { code, data, msg },
@@ -361,7 +362,8 @@
getOptions();
}, []);
const getOptions = async () => {
- const parmas = {
+ const parmas = {
+ "type": "supplier"
}
const {
data: { code, data, msg },
--
Gitblit v1.9.1