From 17cf2408a80d362792ff43542f2bb6feefb2e247 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 21 二月 2025 14:42:55 +0800
Subject: [PATCH] #

---
 rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx     |   10 ++--
 rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupPanel.jsx  |    2 
 rsf-admin/src/page/basicInfo/warehouse/WarehousePanel.jsx    |    2 
 rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupList.jsx   |   10 ++--
 rsf-admin/src/page/basicInfo/shipper/index.jsx               |    0 
 rsf-admin/src/page/basicInfo/warehouse/index.jsx             |    0 
 rsf-admin/src/page/basicInfo/shipper/ShipperList.jsx         |   10 ++--
 rsf-admin/src/page/basicInfo/shipper/ShipperPanel.jsx        |    2 
 rsf-admin/src/page/basicInfo/matnrGroup/index.jsx            |    0 
 rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx   |    8 ++--
 rsf-admin/src/page/basicInfo/shipper/ShipperEdit.jsx         |    8 ++--
 rsf-admin/src/page/basicInfo/shipper/ShipperCreate.jsx       |    6 +-
 rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx   |    6 +-
 rsf-admin/src/page/ResourceContent.js                        |    6 +-
 rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupCreate.jsx |    6 +-
 rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx     |    8 ++--
 16 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index 989d17e..74b7e08 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -14,10 +14,10 @@
 import user from './system/user';
 import operationRecord from './system/operationRecord';
 import customer from './customer';
-import shipper from './shipper';
+import shipper from './basicInfo/shipper';
 import matnr from './basicInfo/matnr';
-import matnrGroup from './matnrGroup';
-import warehouse from './warehouse';
+import matnrGroup from './basicInfo/matnrGroup';
+import warehouse from './basicInfo/warehouse';
 import warehouseAreas from './warehouseAreas';
 
 
diff --git a/rsf-admin/src/page/matnrGroup/MatnrGroupCreate.jsx b/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupCreate.jsx
similarity index 95%
rename from rsf-admin/src/page/matnrGroup/MatnrGroupCreate.jsx
rename to rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupCreate.jsx
index 3344309..0146f24 100644
--- a/rsf-admin/src/page/matnrGroup/MatnrGroupCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupCreate.jsx
@@ -27,9 +27,9 @@
     Grid,
     Box,
 } from '@mui/material';
-import DialogCloseButton from "../components/DialogCloseButton";
-import StatusSelectInput from "../components/StatusSelectInput";
-import MemoInput from "../components/MemoInput";
+import DialogCloseButton from "@/page/components/DialogCloseButton";
+import StatusSelectInput from "@/page/components/StatusSelectInput";
+import MemoInput from "@/page/components/MemoInput";
 
 const MatnrGroupCreate = (props) => {
     const { open, setOpen } = props;
diff --git a/rsf-admin/src/page/matnrGroup/MatnrGroupEdit.jsx b/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx
similarity index 92%
rename from rsf-admin/src/page/matnrGroup/MatnrGroupEdit.jsx
rename to rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx
index 8240f0c..1d769c9 100644
--- a/rsf-admin/src/page/matnrGroup/MatnrGroupEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx
@@ -24,10 +24,10 @@
 import { Stack, Grid, Box, Typography } from '@mui/material';
 import * as Common from '@/utils/common';
 import { EDIT_MODE, REFERENCE_INPUT_PAGESIZE } from '@/config/setting';
-import EditBaseAside from "../components/EditBaseAside";
-import CustomerTopToolBar from "../components/EditTopToolBar";
-import MemoInput from "../components/MemoInput";
-import StatusSelectInput from "../components/StatusSelectInput";
+import EditBaseAside from "@/page/components/EditBaseAside";
+import CustomerTopToolBar from "@/page/components/EditTopToolBar";
+import MemoInput from "@/page/components/MemoInput";
+import StatusSelectInput from "@/page/components/StatusSelectInput";
 
 const FormToolbar = () => {
     const { getValues } = useFormContext();
diff --git a/rsf-admin/src/page/matnrGroup/MatnrGroupList.jsx b/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupList.jsx
similarity index 94%
rename from rsf-admin/src/page/matnrGroup/MatnrGroupList.jsx
rename to rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupList.jsx
index 7a34054..b7ee747 100644
--- a/rsf-admin/src/page/matnrGroup/MatnrGroupList.jsx
+++ b/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupList.jsx
@@ -36,11 +36,11 @@
 import { styled } from '@mui/material/styles';
 import MatnrGroupCreate from "./MatnrGroupCreate";
 import MatnrGroupPanel from "./MatnrGroupPanel";
-import EmptyData from "../components/EmptyData";
-import MyCreateButton from "../components/MyCreateButton";
-import MyExportButton from '../components/MyExportButton';
-import PageDrawer from "../components/PageDrawer";
-import MyField from "../components/MyField";
+import EmptyData from "@/page/components/EmptyData";
+import MyCreateButton from "@/page/components/MyCreateButton";
+import MyExportButton from '@/page/components/MyExportButton';
+import PageDrawer from "@/page/components/PageDrawer";
+import MyField from "@/page/components/MyField";
 import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
 import * as Common from '@/utils/common';
 
diff --git a/rsf-admin/src/page/matnrGroup/MatnrGroupPanel.jsx b/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupPanel.jsx
similarity index 97%
rename from rsf-admin/src/page/matnrGroup/MatnrGroupPanel.jsx
rename to rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupPanel.jsx
index f704804..c00591c 100644
--- a/rsf-admin/src/page/matnrGroup/MatnrGroupPanel.jsx
+++ b/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupPanel.jsx
@@ -4,7 +4,7 @@
     useTranslate,
     useRecordContext,
 } from 'react-admin';
-import PanelTypography from "../components/PanelTypography";
+import PanelTypography from "@/page/components/PanelTypography";
 import * as Common from '@/utils/common'
 
 const MatnrGroupPanel = () => {
diff --git a/rsf-admin/src/page/matnrGroup/index.jsx b/rsf-admin/src/page/basicInfo/matnrGroup/index.jsx
similarity index 100%
rename from rsf-admin/src/page/matnrGroup/index.jsx
rename to rsf-admin/src/page/basicInfo/matnrGroup/index.jsx
diff --git a/rsf-admin/src/page/shipper/ShipperCreate.jsx b/rsf-admin/src/page/basicInfo/shipper/ShipperCreate.jsx
similarity index 95%
rename from rsf-admin/src/page/shipper/ShipperCreate.jsx
rename to rsf-admin/src/page/basicInfo/shipper/ShipperCreate.jsx
index d4e07fd..b45fd01 100644
--- a/rsf-admin/src/page/shipper/ShipperCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/shipper/ShipperCreate.jsx
@@ -27,9 +27,9 @@
     Grid,
     Box,
 } from '@mui/material';
-import DialogCloseButton from "../components/DialogCloseButton";
-import StatusSelectInput from "../components/StatusSelectInput";
-import MemoInput from "../components/MemoInput";
+import DialogCloseButton from "@/page/components/DialogCloseButton";
+import StatusSelectInput from "@/page/components/StatusSelectInput";
+import MemoInput from "@/page/components/MemoInput";
 
 const ShipperCreate = (props) => {
     const { open, setOpen } = props;
diff --git a/rsf-admin/src/page/shipper/ShipperEdit.jsx b/rsf-admin/src/page/basicInfo/shipper/ShipperEdit.jsx
similarity index 91%
rename from rsf-admin/src/page/shipper/ShipperEdit.jsx
rename to rsf-admin/src/page/basicInfo/shipper/ShipperEdit.jsx
index 7b6b543..e81f51e 100644
--- a/rsf-admin/src/page/shipper/ShipperEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/shipper/ShipperEdit.jsx
@@ -24,10 +24,10 @@
 import { Stack, Grid, Box, Typography } from '@mui/material';
 import * as Common from '@/utils/common';
 import { EDIT_MODE, REFERENCE_INPUT_PAGESIZE } from '@/config/setting';
-import EditBaseAside from "../components/EditBaseAside";
-import CustomerTopToolBar from "../components/EditTopToolBar";
-import MemoInput from "../components/MemoInput";
-import StatusSelectInput from "../components/StatusSelectInput";
+import EditBaseAside from "@/page/components/EditBaseAside";
+import CustomerTopToolBar from "@/page/components/EditTopToolBar";
+import MemoInput from "@/page/components/MemoInput";
+import StatusSelectInput from "@/page/components/StatusSelectInput";
 
 const FormToolbar = () => {
     const { getValues } = useFormContext();
diff --git a/rsf-admin/src/page/shipper/ShipperList.jsx b/rsf-admin/src/page/basicInfo/shipper/ShipperList.jsx
similarity index 94%
rename from rsf-admin/src/page/shipper/ShipperList.jsx
rename to rsf-admin/src/page/basicInfo/shipper/ShipperList.jsx
index f97ca55..facfcd5 100644
--- a/rsf-admin/src/page/shipper/ShipperList.jsx
+++ b/rsf-admin/src/page/basicInfo/shipper/ShipperList.jsx
@@ -36,11 +36,11 @@
 import { styled } from '@mui/material/styles';
 import ShipperCreate from "./ShipperCreate";
 import ShipperPanel from "./ShipperPanel";
-import EmptyData from "../components/EmptyData";
-import MyCreateButton from "../components/MyCreateButton";
-import MyExportButton from '../components/MyExportButton';
-import PageDrawer from "../components/PageDrawer";
-import MyField from "../components/MyField";
+import EmptyData from "@/page/components/EmptyData";
+import MyCreateButton from "@/page/components/MyCreateButton";
+import MyExportButton from '@/page/components/MyExportButton';
+import PageDrawer from "@/page/components/PageDrawer";
+import MyField from "@/page/components/MyField";
 import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
 import * as Common from '@/utils/common';
 
diff --git a/rsf-admin/src/page/shipper/ShipperPanel.jsx b/rsf-admin/src/page/basicInfo/shipper/ShipperPanel.jsx
similarity index 97%
rename from rsf-admin/src/page/shipper/ShipperPanel.jsx
rename to rsf-admin/src/page/basicInfo/shipper/ShipperPanel.jsx
index 1f57cf0..f548e14 100644
--- a/rsf-admin/src/page/shipper/ShipperPanel.jsx
+++ b/rsf-admin/src/page/basicInfo/shipper/ShipperPanel.jsx
@@ -4,7 +4,7 @@
     useTranslate,
     useRecordContext,
 } from 'react-admin';
-import PanelTypography from "../components/PanelTypography";
+import PanelTypography from "@/page/components/PanelTypography";
 import * as Common from '@/utils/common'
 
 const ShipperPanel = () => {
diff --git a/rsf-admin/src/page/shipper/index.jsx b/rsf-admin/src/page/basicInfo/shipper/index.jsx
similarity index 100%
rename from rsf-admin/src/page/shipper/index.jsx
rename to rsf-admin/src/page/basicInfo/shipper/index.jsx
diff --git a/rsf-admin/src/page/warehouse/WarehouseCreate.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
similarity index 97%
rename from rsf-admin/src/page/warehouse/WarehouseCreate.jsx
rename to rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
index 5eb2bf9..b2127b6 100644
--- a/rsf-admin/src/page/warehouse/WarehouseCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
@@ -27,9 +27,9 @@
     Grid,
     Box,
 } from '@mui/material';
-import DialogCloseButton from "../components/DialogCloseButton";
-import StatusSelectInput from "../components/StatusSelectInput";
-import MemoInput from "../components/MemoInput";
+import DialogCloseButton from "@/page/components/DialogCloseButton";
+import StatusSelectInput from "@/page/components/StatusSelectInput";
+import MemoInput from "@/page/components/MemoInput";
 
 const WarehouseCreate = (props) => {
     const { open, setOpen } = props;
diff --git a/rsf-admin/src/page/warehouse/WarehouseEdit.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
similarity index 95%
rename from rsf-admin/src/page/warehouse/WarehouseEdit.jsx
rename to rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
index 7c53724..5e83d70 100644
--- a/rsf-admin/src/page/warehouse/WarehouseEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
@@ -24,10 +24,10 @@
 import { Stack, Grid, Box, Typography } from '@mui/material';
 import * as Common from '@/utils/common';
 import { EDIT_MODE, REFERENCE_INPUT_PAGESIZE } from '@/config/setting';
-import EditBaseAside from "../components/EditBaseAside";
-import CustomerTopToolBar from "../components/EditTopToolBar";
-import MemoInput from "../components/MemoInput";
-import StatusSelectInput from "../components/StatusSelectInput";
+import EditBaseAside from "@/page/components/EditBaseAside";
+import CustomerTopToolBar from "@/page/components/EditTopToolBar";
+import MemoInput from "@/page/components/MemoInput";
+import StatusSelectInput from "@/page/components/StatusSelectInput";
 
 const FormToolbar = () => {
     const { getValues } = useFormContext();
diff --git a/rsf-admin/src/page/warehouse/WarehouseList.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx
similarity index 95%
rename from rsf-admin/src/page/warehouse/WarehouseList.jsx
rename to rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx
index 2c902fd..233fce1 100644
--- a/rsf-admin/src/page/warehouse/WarehouseList.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx
@@ -36,11 +36,11 @@
 import { styled } from '@mui/material/styles';
 import WarehouseCreate from "./WarehouseCreate";
 import WarehousePanel from "./WarehousePanel";
-import EmptyData from "../components/EmptyData";
-import MyCreateButton from "../components/MyCreateButton";
-import MyExportButton from '../components/MyExportButton';
-import PageDrawer from "../components/PageDrawer";
-import MyField from "../components/MyField";
+import EmptyData from "@/page/components/EmptyData";
+import MyCreateButton from "@/page/components/MyCreateButton";
+import MyExportButton from '@/page/components/MyExportButton';
+import PageDrawer from "@/page/components/PageDrawer";
+import MyField from "@/page/components/MyField";
 import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
 import * as Common from '@/utils/common';
 
diff --git a/rsf-admin/src/page/warehouse/WarehousePanel.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehousePanel.jsx
similarity index 98%
rename from rsf-admin/src/page/warehouse/WarehousePanel.jsx
rename to rsf-admin/src/page/basicInfo/warehouse/WarehousePanel.jsx
index acb6e40..b1fc42f 100644
--- a/rsf-admin/src/page/warehouse/WarehousePanel.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehousePanel.jsx
@@ -4,7 +4,7 @@
     useTranslate,
     useRecordContext,
 } from 'react-admin';
-import PanelTypography from "../components/PanelTypography";
+import PanelTypography from "@/page/components/PanelTypography";
 import * as Common from '@/utils/common'
 
 const WarehousePanel = () => {
diff --git a/rsf-admin/src/page/warehouse/index.jsx b/rsf-admin/src/page/basicInfo/warehouse/index.jsx
similarity index 100%
rename from rsf-admin/src/page/warehouse/index.jsx
rename to rsf-admin/src/page/basicInfo/warehouse/index.jsx

--
Gitblit v1.9.1