From 2d5ffc17e5d76a468493b21c45df1ca547b10da3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 13:40:17 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx | 74 +++++++++++++++++++++++++++++++++---
1 files changed, 67 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx b/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
index a44e1fb..cf5d60c 100644
--- a/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
+++ b/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
@@ -63,7 +63,17 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
- <TextField source="warehouseId" label="table.field.warehouseAreas.wareId" alwaysOn />,
+ <ReferenceInput
+ source="warehouseId"
+ label="table.field.loc.warehouseId"
+ reference="warehouse"
+ >
+ <AutocompleteInput
+ label="table.field.loc.warehouseId"
+ optionText="name"
+ filterToQuery={(val) => ({ name: val })}
+ />
+ </ReferenceInput>,
<TextInput source="uuid" label="table.field.warehouseAreas.uuid" />,
<TextInput source="name" label="table.field.warehouseAreas.name" />,
<TextInput source="code" label="table.field.warehouseAreas.code" />,
@@ -104,7 +114,6 @@
const WarehouseAreasList = () => {
const translate = useTranslate();
-
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
@@ -122,7 +131,7 @@
title={"menu.warehouseAreas"}
empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
filters={filters}
- sort={{ field: "create_time", order: "desc" }}
+ sort={{ field: "warehouseId", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
@@ -137,7 +146,9 @@
preferenceKey='warehouseAreas'
bulkActionButtons={
<>
- <BatchButton />
+ <WareButton />
+ <MixButton />
+ <StatusButton />
<BulkDeleteButton mutationMode={OPERATE_MODE} />
</>
}
@@ -148,6 +159,7 @@
{/* <TextField source="uuid" label="table.field.warehouseAreas.uuid" /> */}
<TextField source="name" label="table.field.warehouseAreas.name" />
<TextField source="code" label="table.field.warehouseAreas.code" />
+ <TextField source="type$" label="table.field.warehouseAreas.type"/>
{/* <ReferenceField source="shipperId" label="table.field.warehouseAreas.shipperId" reference="shipper" link={false} sortable={false}>
<TextField source="name" />
</ReferenceField> */}
@@ -157,7 +169,6 @@
<TextField source="flagMinus$" label="table.field.warehouseAreas.flagMinus" sortable={false} />
<TextField source="flagLabelMange$" label="table.field.warehouseAreas.flagLabelMange" sortable={false} />
<TextField source="flagMix$" label="table.field.warehouseAreas.flagMix" sortable={false} />
-
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
</ReferenceField>
@@ -191,7 +202,7 @@
export default WarehouseAreasList;
-const BatchButton = () => {
+const MixButton = () => {
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
@@ -201,13 +212,62 @@
return (
<>
- <Button onClick={() => setCreateDialog(true)} label={"toolbar.batch"}>
+ <Button onClick={() => setCreateDialog(true)} label={"toolbar.batchMix"}>
<EditIcon />
</Button>
<BatchModal
open={createDialog}
setOpen={setCreateDialog}
+ fieldType={'flagMix'}
+ />
+ </>
+
+ )
+}
+
+const WareButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+
+
+ const [createDialog, setCreateDialog] = useState(false);
+
+ return (
+ <>
+ <Button onClick={() => setCreateDialog(true)} label={"toolbar.batchWarehouse"}>
+ <EditIcon />
+ </Button>
+
+ <BatchModal
+ open={createDialog}
+ setOpen={setCreateDialog}
+ fieldType={'wareId'}
+ />
+ </>
+
+ )
+}
+
+const StatusButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+
+
+ const [createDialog, setCreateDialog] = useState(false);
+
+ return (
+ <>
+ <Button onClick={() => setCreateDialog(true)} label={"toolbar.batchStatus"}>
+ <EditIcon />
+ </Button>
+
+ <BatchModal
+ open={createDialog}
+ setOpen={setCreateDialog}
+ fieldType={'status'}
/>
</>
--
Gitblit v1.9.1