From 27f59f44345d044967e2048f09dbd704f90ce3db Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 25 四月 2025 17:51:20 +0800
Subject: [PATCH] #新增  1. 新增波次功能  2. 库区新增优化

---
 rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx b/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
index 180bcf2..86a989a 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" />,
+    <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,9 +114,9 @@
 
 const WarehouseAreasList = () => {
     const translate = useTranslate();
-
     const [createDialog, setCreateDialog] = useState(false);
     const [drawerVal, setDrawerVal] = useState(false);
+    const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_ware_areas_type')) || [];
 
     return (
         <Box display="flex">
@@ -122,7 +132,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 />
@@ -150,6 +160,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> */}
@@ -159,7 +170,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>

--
Gitblit v1.9.1