From 5c2b139f43afffbca650b2378385d69c7cfc0879 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 14 四月 2025 15:15:08 +0800
Subject: [PATCH] 代码模块优化
---
rsf-admin/src/page/histories/taskLog/TaskLogEdit.jsx | 4
rsf-admin/src/page/orders/qlyInspect/QlyInspectOpCreate.jsx | 6 +-
rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogCreate.jsx | 6 +-
rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogPanel.jsx | 2
rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogCreate.jsx | 0
rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogEdit.jsx | 8 +-
rsf-admin/src/page/orders/qlyInspect/QlyInspectPanel.jsx | 2
rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx | 8 +-
rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogPanel.jsx | 0
rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx | 10 +-
rsf-admin/src/page/ResourceContent.js | 13 +--
rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogEdit.jsx | 0
rsf-admin/src/page/histories/waitPakinLog/WaitPakinItemLogList.jsx | 10 +-
rsf-admin/src/page/orders/qlyInspect/QlyInspectCreate.jsx | 6 +-
rsf-admin/src/page/histories/taskLog/TaskLogPanel.jsx | 2
rsf-admin/src/page/histories/asnOrderLog/AsnOrderItemLogList.jsx | 0
rsf-admin/src/page/orders/qlyInspect/index.jsx | 0
rsf-admin/src/page/orders/qlyInspect/InspectModal.jsx | 4
rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx | 0
rsf-admin/src/page/orders/qlyInspect/AsnSelModal.jsx | 4
rsf-admin/src/page/histories/taskLog/TaskLogList.jsx | 10 +-
rsf-admin/src/page/orders/qlyInspect/QlyIsptItemCreate.jsx | 6 +-
rsf-admin/src/page/histories/taskLog/TaskItemLogList.jsx | 4
rsf-admin/src/page/orders/qlyInspect/QlyInspectEdit.jsx | 8 +-
rsf-admin/src/page/histories/taskLog/TaskLogCreate.jsx | 6 +-
/dev/null | 18 ------
rsf-admin/src/page/task/TaskList.jsx | 2
rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogList.jsx | 6 +-
rsf-admin/src/page/histories/asnOrderLog/index.jsx | 0
rsf-admin/src/page/histories/taskLog/index.jsx | 0
rsf-admin/src/page/orders/qlyInspect/QlyIsptItemEdit.jsx | 8 +-
rsf-admin/src/page/histories/waitPakinLog/index.jsx | 0
32 files changed, 66 insertions(+), 87 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index 3a81c8e..928a557 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -20,7 +20,7 @@
import loc from './basicInfo/loc';
import container from './container';
import contract from './contract';
-import qlyInspect from './qlyInspect';
+import qlyInspect from './orders/qlyInspect';
import dictType from './system/dicts/dictType';
import companys from './basicInfo/companys';
import locType from './basicInfo/locType';
@@ -34,13 +34,12 @@
import fields from './fields';
import fieldsItem from './fieldsItem';
import warehouseAreasItem from './warehouseAreasItem';
-import deviceSite from './basicInfo//deviceSite';
+import deviceSite from './basicInfo/deviceSite';
import waitPakin from './waitPakin';
-import waitPakinItem from './waitPakinItem';
-import waitPakinLog from './waitPakinLog';
-import asnOrderLog from './orders/asnOrderLog';
+import waitPakinLog from './histories/waitPakinLog';
+import asnOrderLog from './histories/asnOrderLog';
import task from './task';
-import taskLog from './taskLog';
+import taskLog from './histories/taskLog';
const ResourceContent = (node) => {
switch (node.component) {
@@ -110,8 +109,6 @@
return deviceSite;
case 'waitPakin':
return waitPakin;
- case 'waitPakinItem':
- return waitPakinItem;
case 'waitPakinLog':
return waitPakinLog;
case 'task':
diff --git a/rsf-admin/src/page/orders/asnOrderLog/AsnOrderItemLogList.jsx b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderItemLogList.jsx
similarity index 100%
rename from rsf-admin/src/page/orders/asnOrderLog/AsnOrderItemLogList.jsx
rename to rsf-admin/src/page/histories/asnOrderLog/AsnOrderItemLogList.jsx
diff --git a/rsf-admin/src/page/orders/asnOrderLog/AsnOrderLogCreate.jsx b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogCreate.jsx
similarity index 100%
rename from rsf-admin/src/page/orders/asnOrderLog/AsnOrderLogCreate.jsx
rename to rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogCreate.jsx
diff --git a/rsf-admin/src/page/orders/asnOrderLog/AsnOrderLogEdit.jsx b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogEdit.jsx
similarity index 100%
rename from rsf-admin/src/page/orders/asnOrderLog/AsnOrderLogEdit.jsx
rename to rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogEdit.jsx
diff --git a/rsf-admin/src/page/orders/asnOrderLog/AsnOrderLogList.jsx b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx
similarity index 100%
rename from rsf-admin/src/page/orders/asnOrderLog/AsnOrderLogList.jsx
rename to rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx
diff --git a/rsf-admin/src/page/orders/asnOrderLog/AsnOrderLogPanel.jsx b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogPanel.jsx
similarity index 100%
rename from rsf-admin/src/page/orders/asnOrderLog/AsnOrderLogPanel.jsx
rename to rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogPanel.jsx
diff --git a/rsf-admin/src/page/orders/asnOrderLog/index.jsx b/rsf-admin/src/page/histories/asnOrderLog/index.jsx
similarity index 100%
rename from rsf-admin/src/page/orders/asnOrderLog/index.jsx
rename to rsf-admin/src/page/histories/asnOrderLog/index.jsx
diff --git a/rsf-admin/src/page/taskLog/TaskItemLogList.jsx b/rsf-admin/src/page/histories/taskLog/TaskItemLogList.jsx
similarity index 97%
rename from rsf-admin/src/page/taskLog/TaskItemLogList.jsx
rename to rsf-admin/src/page/histories/taskLog/TaskItemLogList.jsx
index 8659c06..e571383 100644
--- a/rsf-admin/src/page/taskLog/TaskItemLogList.jsx
+++ b/rsf-admin/src/page/histories/taskLog/TaskItemLogList.jsx
@@ -35,8 +35,8 @@
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
-import MyExportButton from '../components/MyExportButton';
-import PageDrawer from "../components/PageDrawer";
+import MyExportButton from '../../components/MyExportButton';
+import PageDrawer from "../../components/PageDrawer";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
diff --git a/rsf-admin/src/page/taskLog/TaskLogCreate.jsx b/rsf-admin/src/page/histories/taskLog/TaskLogCreate.jsx
similarity index 97%
rename from rsf-admin/src/page/taskLog/TaskLogCreate.jsx
rename to rsf-admin/src/page/histories/taskLog/TaskLogCreate.jsx
index 248a643..3596d2d 100644
--- a/rsf-admin/src/page/taskLog/TaskLogCreate.jsx
+++ b/rsf-admin/src/page/histories/taskLog/TaskLogCreate.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 "../../components/DialogCloseButton";
+import StatusSelectInput from "../../components/StatusSelectInput";
+import MemoInput from "../../components/MemoInput";
const TaskLogCreate = (props) => {
const { open, setOpen } = props;
diff --git a/rsf-admin/src/page/taskLog/TaskLogEdit.jsx b/rsf-admin/src/page/histories/taskLog/TaskLogEdit.jsx
similarity index 97%
rename from rsf-admin/src/page/taskLog/TaskLogEdit.jsx
rename to rsf-admin/src/page/histories/taskLog/TaskLogEdit.jsx
index 6c366fc..3552cc7 100644
--- a/rsf-admin/src/page/taskLog/TaskLogEdit.jsx
+++ b/rsf-admin/src/page/histories/taskLog/TaskLogEdit.jsx
@@ -12,8 +12,8 @@
import { Stack, Grid, Box, Typography, Card } 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 EditBaseAside from "../../components/EditBaseAside";
+import CustomerTopToolBar from "../../components/EditTopToolBar";
import TaskItemLogList from "./TaskItemLogList";
const FormToolbar = () => {
diff --git a/rsf-admin/src/page/taskLog/TaskLogList.jsx b/rsf-admin/src/page/histories/taskLog/TaskLogList.jsx
similarity index 95%
rename from rsf-admin/src/page/taskLog/TaskLogList.jsx
rename to rsf-admin/src/page/histories/taskLog/TaskLogList.jsx
index fd93f6e..c769153 100644
--- a/rsf-admin/src/page/taskLog/TaskLogList.jsx
+++ b/rsf-admin/src/page/histories/taskLog/TaskLogList.jsx
@@ -36,11 +36,11 @@
import { styled } from '@mui/material/styles';
import TaskLogCreate from "./TaskLogCreate";
import TaskLogPanel from "./TaskLogPanel";
-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 "../../components/EmptyData";
+import MyCreateButton from "../../components/MyCreateButton";
+import MyExportButton from '../../components/MyExportButton';
+import PageDrawer from "../../components/PageDrawer";
+import MyField from "../../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/taskLog/TaskLogPanel.jsx b/rsf-admin/src/page/histories/taskLog/TaskLogPanel.jsx
similarity index 98%
rename from rsf-admin/src/page/taskLog/TaskLogPanel.jsx
rename to rsf-admin/src/page/histories/taskLog/TaskLogPanel.jsx
index 5288345..ffdffc3 100644
--- a/rsf-admin/src/page/taskLog/TaskLogPanel.jsx
+++ b/rsf-admin/src/page/histories/taskLog/TaskLogPanel.jsx
@@ -4,7 +4,7 @@
useTranslate,
useRecordContext,
} from 'react-admin';
-import PanelTypography from "../components/PanelTypography";
+import PanelTypography from "../../components/PanelTypography";
import * as Common from '@/utils/common'
const TaskLogPanel = () => {
diff --git a/rsf-admin/src/page/taskLog/index.jsx b/rsf-admin/src/page/histories/taskLog/index.jsx
similarity index 100%
rename from rsf-admin/src/page/taskLog/index.jsx
rename to rsf-admin/src/page/histories/taskLog/index.jsx
diff --git a/rsf-admin/src/page/waitPakinLog/WaitPakinItemLogList.jsx b/rsf-admin/src/page/histories/waitPakinLog/WaitPakinItemLogList.jsx
similarity index 96%
rename from rsf-admin/src/page/waitPakinLog/WaitPakinItemLogList.jsx
rename to rsf-admin/src/page/histories/waitPakinLog/WaitPakinItemLogList.jsx
index 31b2e7d..c088062 100644
--- a/rsf-admin/src/page/waitPakinLog/WaitPakinItemLogList.jsx
+++ b/rsf-admin/src/page/histories/waitPakinLog/WaitPakinItemLogList.jsx
@@ -34,11 +34,11 @@
useGetRecordId,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
-import { styled } from '@mui/material/styles'; 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 { styled } from '@mui/material/styles'; 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 { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
diff --git a/rsf-admin/src/page/waitPakinLog/WaitPakinLogCreate.jsx b/rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogCreate.jsx
similarity index 96%
rename from rsf-admin/src/page/waitPakinLog/WaitPakinLogCreate.jsx
rename to rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogCreate.jsx
index a3f7f0a..a689284 100644
--- a/rsf-admin/src/page/waitPakinLog/WaitPakinLogCreate.jsx
+++ b/rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogCreate.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 "../../components/DialogCloseButton";
+import StatusSelectInput from "../../components/StatusSelectInput";
+import MemoInput from "../../components/MemoInput";
const WaitPakinLogCreate = (props) => {
const { open, setOpen } = props;
diff --git a/rsf-admin/src/page/waitPakinLog/WaitPakinLogEdit.jsx b/rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogEdit.jsx
similarity index 93%
rename from rsf-admin/src/page/waitPakinLog/WaitPakinLogEdit.jsx
rename to rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogEdit.jsx
index ac2350e..958deb6 100644
--- a/rsf-admin/src/page/waitPakinLog/WaitPakinLogEdit.jsx
+++ b/rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogEdit.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 "../../components/EditBaseAside";
+import CustomerTopToolBar from "../../components/EditTopToolBar";
+import MemoInput from "../../components/MemoInput";
+import StatusSelectInput from "../../components/StatusSelectInput";
import WaitPakinItemLogList from "./WaitPakinItemLogList";
const FormToolbar = () => {
diff --git a/rsf-admin/src/page/waitPakinLog/WaitPakinLogList.jsx b/rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogList.jsx
similarity index 96%
rename from rsf-admin/src/page/waitPakinLog/WaitPakinLogList.jsx
rename to rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogList.jsx
index c689002..ff30723 100644
--- a/rsf-admin/src/page/waitPakinLog/WaitPakinLogList.jsx
+++ b/rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogList.jsx
@@ -34,9 +34,9 @@
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
-import EmptyData from "../components/EmptyData";
-import MyExportButton from '../components/MyExportButton';
-import PageDrawer from "../components/PageDrawer";
+import EmptyData from "../../components/EmptyData";
+import MyExportButton from '../../components/MyExportButton';
+import PageDrawer from "../../components/PageDrawer";
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/waitPakinLog/WaitPakinLogPanel.jsx b/rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogPanel.jsx
similarity index 97%
rename from rsf-admin/src/page/waitPakinLog/WaitPakinLogPanel.jsx
rename to rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogPanel.jsx
index d8975d2..d390e07 100644
--- a/rsf-admin/src/page/waitPakinLog/WaitPakinLogPanel.jsx
+++ b/rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogPanel.jsx
@@ -7,7 +7,7 @@
useRefresh,
useListContext,
} from 'react-admin';
-import PanelTypography from "../components/PanelTypography";
+import PanelTypography from "../../components/PanelTypography";
import * as Common from '@/utils/common'
import { styled } from "@mui/material/styles";
import request from '@/utils/request';
diff --git a/rsf-admin/src/page/waitPakinLog/index.jsx b/rsf-admin/src/page/histories/waitPakinLog/index.jsx
similarity index 100%
rename from rsf-admin/src/page/waitPakinLog/index.jsx
rename to rsf-admin/src/page/histories/waitPakinLog/index.jsx
diff --git a/rsf-admin/src/page/locAreaRela/LocAreaRelaList.jsx b/rsf-admin/src/page/locAreaRela/LocAreaRelaList.jsx
deleted file mode 100644
index cb1ae2b..0000000
--- a/rsf-admin/src/page/locAreaRela/LocAreaRelaList.jsx
+++ /dev/null
@@ -1,154 +0,0 @@
-import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
-import { useNavigate } from 'react-router-dom';
-import {
- List,
- DatagridConfigurable,
- SearchInput,
- TopToolbar,
- SelectColumnsButton,
- EditButton,
- FilterButton,
- CreateButton,
- ExportButton,
- BulkDeleteButton,
- WrapperField,
- useRecordContext,
- useTranslate,
- useNotify,
- useListContext,
- FunctionField,
- TextField,
- NumberField,
- DateField,
- BooleanField,
- ReferenceField,
- TextInput,
- DateTimeInput,
- DateInput,
- SelectInput,
- NumberInput,
- ReferenceInput,
- ReferenceArrayInput,
- AutocompleteInput,
- DeleteButton,
-} from 'react-admin';
-import { Box, Typography, Card, Stack } from '@mui/material';
-import { styled } from '@mui/material/styles';
-import LocAreaRelaCreate from "./LocAreaRelaCreate";
-import LocAreaRelaPanel from "./LocAreaRelaPanel";
-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 { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
-import * as Common from '@/utils/common';
-
-const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
- '& .css-1vooibu-MuiSvgIcon-root': {
- height: '.9em'
- },
- '& .RaDatagrid-row': {
- cursor: 'auto'
- },
- '& .column-name': {
- },
- '& .opt': {
- width: 200
- },
-}));
-
-const filters = [
- <SearchInput source="condition" alwaysOn />,
- <DateInput label='common.time.after' source="timeStart" alwaysOn />,
- <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
-
- <NumberInput source="locAreaId" label="table.field.locAreaRela.locAreaId" />,
- <NumberInput source="locId" label="table.field.locAreaRela.locId" />,
-
- <TextInput label="common.field.memo" source="memo" />,
- <SelectInput
- label="common.field.status"
- source="status"
- choices={[
- { id: '1', name: 'common.enums.statusTrue' },
- { id: '0', name: 'common.enums.statusFalse' },
- ]}
- resettable
- />,
-]
-
-const LocAreaRelaList = () => {
- const translate = useTranslate();
-
- const [createDialog, setCreateDialog] = useState(false);
- const [drawerVal, setDrawerVal] = useState(false);
-
- return (
- <Box display="flex">
- <List
- sx={{
- flexGrow: 1,
- transition: (theme) =>
- theme.transitions.create(['all'], {
- duration: theme.transitions.duration.enteringScreen,
- }),
- marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
- }}
- title={"menu.locAreaRela"}
- empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
- filters={filters}
- sort={{ field: "create_time", order: "desc" }}
- actions={(
- <TopToolbar>
- <FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
- <SelectColumnsButton preferenceKey='locAreaRela' />
- <MyExportButton />
- </TopToolbar>
- )}
- perPage={DEFAULT_PAGE_SIZE}
- >
- <StyledDatagrid
- preferenceKey='locAreaRela'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
- rowClick={(id, resource, record) => false}
- expand={() => <LocAreaRelaPanel />}
- expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
- >
- <NumberField source="id" />
- <NumberField source="locAreaId" label="table.field.locAreaRela.locAreaId" />
- <NumberField source="locId" label="table.field.locAreaRela.locId" />
-
- <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
- <DateField source="updateTime" label="common.field.updateTime" showTime />
- <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
- <DateField source="createTime" label="common.field.createTime" showTime />
- <BooleanField source="statusBool" label="common.field.status" sortable={false} />
- <TextField source="memo" label="common.field.memo" sortable={false} />
- <WrapperField cellClassName="opt" label="common.field.opt">
- <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
- <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
- </WrapperField>
- </StyledDatagrid>
- </List>
- <LocAreaRelaCreate
- open={createDialog}
- setOpen={setCreateDialog}
- />
- <PageDrawer
- title='LocAreaRela Detail'
- drawerVal={drawerVal}
- setDrawerVal={setDrawerVal}
- >
- </PageDrawer>
- </Box>
- )
-}
-
-export default LocAreaRelaList;
diff --git a/rsf-admin/src/page/qlyInspect/AsnSelModal.jsx b/rsf-admin/src/page/orders/qlyInspect/AsnSelModal.jsx
similarity index 97%
rename from rsf-admin/src/page/qlyInspect/AsnSelModal.jsx
rename to rsf-admin/src/page/orders/qlyInspect/AsnSelModal.jsx
index f51a761..58778ea 100644
--- a/rsf-admin/src/page/qlyInspect/AsnSelModal.jsx
+++ b/rsf-admin/src/page/orders/qlyInspect/AsnSelModal.jsx
@@ -15,8 +15,8 @@
Radio,
FormControlLabel,
} from '@mui/material';
-import DialogCloseButton from "../components/DialogCloseButton";
-import ConfirmButton from "../components/ConfirmButton";
+import DialogCloseButton from "../../components/DialogCloseButton";
+import ConfirmButton from "../../components/ConfirmButton";
import { useTranslate, useNotify, useRefresh } from 'react-admin';
import request from '@/utils/request';
import { DataGrid, useGridApiRef } from '@mui/x-data-grid';
diff --git a/rsf-admin/src/page/qlyInspect/InspectModal.jsx b/rsf-admin/src/page/orders/qlyInspect/InspectModal.jsx
similarity index 98%
rename from rsf-admin/src/page/qlyInspect/InspectModal.jsx
rename to rsf-admin/src/page/orders/qlyInspect/InspectModal.jsx
index 07880b5..2faa6ce 100644
--- a/rsf-admin/src/page/qlyInspect/InspectModal.jsx
+++ b/rsf-admin/src/page/orders/qlyInspect/InspectModal.jsx
@@ -15,8 +15,8 @@
Radio,
FormControlLabel,
} from '@mui/material';
-import DialogCloseButton from "../components/DialogCloseButton";
-import ConfirmButton from "../components/ConfirmButton";
+import DialogCloseButton from "../../components/DialogCloseButton";
+import ConfirmButton from "../../components/ConfirmButton";
import { useTranslate, useNotify, useRefresh } from 'react-admin';
import request from '@/utils/request';
import { DataGrid, useGridApiRef } from '@mui/x-data-grid';
diff --git a/rsf-admin/src/page/qlyInspect/QlyInspectCreate.jsx b/rsf-admin/src/page/orders/qlyInspect/QlyInspectCreate.jsx
similarity index 96%
rename from rsf-admin/src/page/qlyInspect/QlyInspectCreate.jsx
rename to rsf-admin/src/page/orders/qlyInspect/QlyInspectCreate.jsx
index 06cffe7..a1a6d85 100644
--- a/rsf-admin/src/page/qlyInspect/QlyInspectCreate.jsx
+++ b/rsf-admin/src/page/orders/qlyInspect/QlyInspectCreate.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 "../../components/DialogCloseButton";
+import StatusSelectInput from "../../components/StatusSelectInput";
+import MemoInput from "../../components/MemoInput";
const QlyInspectCreate = (props) => {
const { open, setOpen } = props;
diff --git a/rsf-admin/src/page/qlyInspect/QlyInspectEdit.jsx b/rsf-admin/src/page/orders/qlyInspect/QlyInspectEdit.jsx
similarity index 94%
rename from rsf-admin/src/page/qlyInspect/QlyInspectEdit.jsx
rename to rsf-admin/src/page/orders/qlyInspect/QlyInspectEdit.jsx
index d44da31..18528e3 100644
--- a/rsf-admin/src/page/qlyInspect/QlyInspectEdit.jsx
+++ b/rsf-admin/src/page/orders/qlyInspect/QlyInspectEdit.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 "../../components/EditBaseAside";
+import CustomerTopToolBar from "../../components/EditTopToolBar";
+import MemoInput from "../../components/MemoInput";
+import StatusSelectInput from "../../components/StatusSelectInput";
import QlyIsptItemList from "./QlyIsptItemList";
const FormToolbar = () => {
diff --git a/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx b/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx
similarity index 96%
rename from rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
rename to rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx
index 6eebda5..03e1721 100644
--- a/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
+++ b/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx
@@ -38,11 +38,11 @@
import { styled } from '@mui/material/styles';
import QlyInspectCreate from "./QlyInspectCreate";
import QlyInspectPanel from "./QlyInspectPanel";
-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 "../../components/EmptyData";
+import MyCreateButton from "../../components/MyCreateButton";
+import MyExportButton from '../../components/MyExportButton';
+import PageDrawer from "../../components/PageDrawer";
+import MyField from "../../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
import ConstructionIcon from "@mui/icons-material/Construction";
diff --git a/rsf-admin/src/page/qlyInspect/QlyInspectOpCreate.jsx b/rsf-admin/src/page/orders/qlyInspect/QlyInspectOpCreate.jsx
similarity index 97%
rename from rsf-admin/src/page/qlyInspect/QlyInspectOpCreate.jsx
rename to rsf-admin/src/page/orders/qlyInspect/QlyInspectOpCreate.jsx
index ea33da9..aa42146 100644
--- a/rsf-admin/src/page/qlyInspect/QlyInspectOpCreate.jsx
+++ b/rsf-admin/src/page/orders/qlyInspect/QlyInspectOpCreate.jsx
@@ -28,9 +28,9 @@
Grid,
Box,
} from '@mui/material';
-import DialogCloseButton from "../components/DialogCloseButton";
-import StatusSelectInput from "../components/StatusSelectInput";
-import MemoInput from "../components/MemoInput";
+import DialogCloseButton from "../../components/DialogCloseButton";
+import StatusSelectInput from "../../components/StatusSelectInput";
+import MemoInput from "../../components/MemoInput";
const QlyInspectOpCreate = (props) => {
const { open, setOpen } = props;
diff --git a/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx b/rsf-admin/src/page/orders/qlyInspect/QlyInspectPanel.jsx
similarity index 98%
rename from rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx
rename to rsf-admin/src/page/orders/qlyInspect/QlyInspectPanel.jsx
index 427d182..28084f9 100644
--- a/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx
+++ b/rsf-admin/src/page/orders/qlyInspect/QlyInspectPanel.jsx
@@ -7,7 +7,7 @@
useRefresh,
useListContext,
} from 'react-admin';
-import PanelTypography from "../components/PanelTypography";
+import PanelTypography from "../../components/PanelTypography";
import * as Common from '@/utils/common'
import { styled } from "@mui/material/styles";
import request from '@/utils/request';
diff --git a/rsf-admin/src/page/qlyInspect/QlyIsptItemCreate.jsx b/rsf-admin/src/page/orders/qlyInspect/QlyIsptItemCreate.jsx
similarity index 97%
rename from rsf-admin/src/page/qlyInspect/QlyIsptItemCreate.jsx
rename to rsf-admin/src/page/orders/qlyInspect/QlyIsptItemCreate.jsx
index 230af01..ecf513e 100644
--- a/rsf-admin/src/page/qlyInspect/QlyIsptItemCreate.jsx
+++ b/rsf-admin/src/page/orders/qlyInspect/QlyIsptItemCreate.jsx
@@ -18,9 +18,9 @@
Grid,
Box,
} from '@mui/material';
-import DialogCloseButton from "../components/DialogCloseButton";
-import StatusSelectInput from "../components/StatusSelectInput";
-import MemoInput from "../components/MemoInput";
+import DialogCloseButton from "../../components/DialogCloseButton";
+import StatusSelectInput from "../../components/StatusSelectInput";
+import MemoInput from "../../components/MemoInput";
const QlyIsptItemCreate = (props) => {
const { open, setOpen, record } = props;
diff --git a/rsf-admin/src/page/qlyInspect/QlyIsptItemEdit.jsx b/rsf-admin/src/page/orders/qlyInspect/QlyIsptItemEdit.jsx
similarity index 95%
rename from rsf-admin/src/page/qlyInspect/QlyIsptItemEdit.jsx
rename to rsf-admin/src/page/orders/qlyInspect/QlyIsptItemEdit.jsx
index 43944ab..068d8f8 100644
--- a/rsf-admin/src/page/qlyInspect/QlyIsptItemEdit.jsx
+++ b/rsf-admin/src/page/orders/qlyInspect/QlyIsptItemEdit.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 "../../components/EditBaseAside";
+import CustomerTopToolBar from "../../components/EditTopToolBar";
+import MemoInput from "../../components/MemoInput";
+import StatusSelectInput from "../../components/StatusSelectInput";
const FormToolbar = () => {
const { getValues } = useFormContext();
diff --git a/rsf-admin/src/page/qlyInspect/QlyIsptItemList.jsx b/rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx
similarity index 96%
rename from rsf-admin/src/page/qlyInspect/QlyIsptItemList.jsx
rename to rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx
index 5c90bc8..5565989 100644
--- a/rsf-admin/src/page/qlyInspect/QlyIsptItemList.jsx
+++ b/rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx
@@ -37,10 +37,10 @@
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
import QlyIsptItemCreate from "./QlyIsptItemCreate";
-import EmptyData from "../components/EmptyData";
-import MyCreateButton from "../components/MyCreateButton";
-import MyExportButton from '../components/MyExportButton';
-import PageDrawer from "../components/PageDrawer";
+import EmptyData from "../../components/EmptyData";
+import MyCreateButton from "../../components/MyCreateButton";
+import MyExportButton from '../../components/MyExportButton';
+import PageDrawer from "../../components/PageDrawer";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_ITEM_PAGE_SIZE } from '@/config/setting';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
diff --git a/rsf-admin/src/page/qlyInspect/index.jsx b/rsf-admin/src/page/orders/qlyInspect/index.jsx
similarity index 100%
rename from rsf-admin/src/page/qlyInspect/index.jsx
rename to rsf-admin/src/page/orders/qlyInspect/index.jsx
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index ecaad61..498a236 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -210,7 +210,7 @@
cancleTask(record)
};
//鍙栨秷浠诲姟
- const cancleTask = async (row) => {
+ const cancleTask = async (row) => {
console.log(row);
const { data: { code, data, msg } } = await request.post(`/task/remove/` + row.id);
if (code === 200) {
diff --git a/rsf-admin/src/page/waitPakinItem/WaitPakinItemCreate.jsx b/rsf-admin/src/page/waitPakinItem/WaitPakinItemCreate.jsx
deleted file mode 100644
index 208cedd..0000000
--- a/rsf-admin/src/page/waitPakinItem/WaitPakinItemCreate.jsx
+++ /dev/null
@@ -1,176 +0,0 @@
-import React, { useState, useRef, useEffect, useMemo } from "react";
-import {
- CreateBase,
- useTranslate,
- TextInput,
- NumberInput,
- BooleanInput,
- DateInput,
- SaveButton,
- SelectInput,
- ReferenceInput,
- ReferenceArrayInput,
- AutocompleteInput,
- Toolbar,
- required,
- useDataProvider,
- useNotify,
- Form,
- useCreateController,
-} from 'react-admin';
-import {
- Dialog,
- DialogActions,
- DialogContent,
- DialogTitle,
- Stack,
- Grid,
- Box,
-} from '@mui/material';
-import DialogCloseButton from "../components/DialogCloseButton";
-import StatusSelectInput from "../components/StatusSelectInput";
-import MemoInput from "../components/MemoInput";
-
-const WaitPakinItemCreate = (props) => {
- const { open, setOpen } = props;
-
- const translate = useTranslate();
- const notify = useNotify();
-
- const handleClose = (event, reason) => {
- if (reason !== "backdropClick") {
- setOpen(false);
- }
- };
-
- const handleSuccess = async (data) => {
- setOpen(false);
- notify('common.response.success');
- };
-
- const handleError = async (error) => {
- notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
- };
-
- return (
- <>
- <CreateBase
- record={{}}
- transform={(data) => {
- return data;
- }}
- mutationOptions={{ onSuccess: handleSuccess, onError: handleError }}
- >
- <Dialog
- open={open}
- onClose={handleClose}
- aria-labelledby="form-dialog-title"
- fullWidth
- disableRestoreFocus
- maxWidth="md" // 'xs' | 'sm' | 'md' | 'lg' | 'xl'
- >
- <Form>
- <DialogTitle id="form-dialog-title" sx={{
- position: 'sticky',
- top: 0,
- backgroundColor: 'background.paper',
- zIndex: 1000
- }}
- >
- {translate('create.title')}
- <Box sx={{ position: 'absolute', top: 8, right: 8, zIndex: 1001 }}>
- <DialogCloseButton onClose={handleClose} />
- </Box>
- </DialogTitle>
- <DialogContent sx={{ mt: 2 }}>
- <Grid container rowSpacing={2} columnSpacing={2}>
- <Grid item xs={6} display="flex" gap={1}>
- <NumberInput
- label="table.field.waitPakinItem.pakinId"
- source="pakinId"
- autoFocus
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.waitPakinItem.maktx"
- source="maktx"
- parse={v => v}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <NumberInput
- label="table.field.waitPakinItem.matnrId"
- source="matnrId"
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.waitPakinItem.matnrCode"
- source="matnrCode"
- parse={v => v}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <NumberInput
- label="table.field.waitPakinItem.anfme"
- source="anfme"
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <NumberInput
- label="table.field.waitPakinItem.workQty"
- source="workQty"
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.waitPakinItem.unit"
- source="unit"
- parse={v => v}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.waitPakinItem.fieldsIndex"
- source="fieldsIndex"
- parse={v => v}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <NumberInput
- label="table.field.waitPakinItem.qty"
- source="qty"
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.waitPakinItem.batch"
- source="batch"
- parse={v => v}
- />
- </Grid>
-
- <Grid item xs={6} display="flex" gap={1}>
- <StatusSelectInput />
- </Grid>
- <Grid item xs={12} display="flex" gap={1}>
- <Stack direction="column" spacing={1} width={'100%'}>
- <MemoInput />
- </Stack>
- </Grid>
- </Grid>
- </DialogContent>
- <DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
- <Toolbar sx={{ width: '100%', justifyContent: 'space-between' }} >
- <SaveButton />
- </Toolbar>
- </DialogActions>
- </Form>
- </Dialog>
- </CreateBase>
- </>
- )
-}
-
-export default WaitPakinItemCreate;
diff --git a/rsf-admin/src/page/waitPakinItem/WaitPakinItemEdit.jsx b/rsf-admin/src/page/waitPakinItem/WaitPakinItemEdit.jsx
deleted file mode 100644
index 7e1238a..0000000
--- a/rsf-admin/src/page/waitPakinItem/WaitPakinItemEdit.jsx
+++ /dev/null
@@ -1,148 +0,0 @@
-import React, { useState, useRef, useEffect, useMemo } from "react";
-import {
- Edit,
- SimpleForm,
- FormDataConsumer,
- useTranslate,
- TextInput,
- NumberInput,
- BooleanInput,
- DateInput,
- SelectInput,
- ReferenceInput,
- ReferenceArrayInput,
- AutocompleteInput,
- SaveButton,
- Toolbar,
- Labeled,
- NumberField,
- required,
- useRecordContext,
- DeleteButton,
-} from 'react-admin';
-import { useWatch, useFormContext } from "react-hook-form";
-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";
-
-const FormToolbar = () => {
- const { getValues } = useFormContext();
-
- return (
- <Toolbar sx={{ justifyContent: 'space-between' }}>
- <SaveButton />
- <DeleteButton mutationMode="optimistic" />
- </Toolbar>
- )
-}
-
-const WaitPakinItemEdit = () => {
- const translate = useTranslate();
-
- return (
- <Edit
- redirect="list"
- mutationMode={EDIT_MODE}
- actions={<CustomerTopToolBar />}
- aside={<EditBaseAside />}
- >
- <SimpleForm
- shouldUnregister
- warnWhenUnsavedChanges
- toolbar={<FormToolbar />}
- mode="onTouched"
- defaultValues={{}}
- // validate={(values) => { }}
- >
- <Grid container width={{ xs: '100%', xl: '80%' }} rowSpacing={3} columnSpacing={3}>
- <Grid item xs={12} md={8}>
- <Typography variant="h6" gutterBottom>
- {translate('common.edit.title.main')}
- </Typography>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.waitPakinItem.pakinId"
- source="pakinId"
- autoFocus
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.waitPakinItem.maktx"
- source="maktx"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.waitPakinItem.matnrId"
- source="matnrId"
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.waitPakinItem.matnrCode"
- source="matnrCode"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.waitPakinItem.anfme"
- source="anfme"
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.waitPakinItem.workQty"
- source="workQty"
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.waitPakinItem.unit"
- source="unit"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.waitPakinItem.fieldsIndex"
- source="fieldsIndex"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.waitPakinItem.qty"
- source="qty"
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.waitPakinItem.batch"
- source="batch"
- parse={v => v}
- />
- </Stack>
-
- </Grid>
- <Grid item xs={12} md={4}>
- <Typography variant="h6" gutterBottom>
- {translate('common.edit.title.common')}
- </Typography>
- <StatusSelectInput />
- <Box mt="2em" />
- <MemoInput />
- </Grid>
- </Grid>
- </SimpleForm>
- </Edit >
- )
-}
-
-export default WaitPakinItemEdit;
diff --git a/rsf-admin/src/page/waitPakinItem/WaitPakinItemList.jsx b/rsf-admin/src/page/waitPakinItem/WaitPakinItemList.jsx
deleted file mode 100644
index 9d8f88f..0000000
--- a/rsf-admin/src/page/waitPakinItem/WaitPakinItemList.jsx
+++ /dev/null
@@ -1,159 +0,0 @@
-import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
-import { useNavigate } from 'react-router-dom';
-import {
- List,
- DatagridConfigurable,
- SearchInput,
- TopToolbar,
- SelectColumnsButton,
- EditButton,
- FilterButton,
- CreateButton,
- ExportButton,
- BulkDeleteButton,
- WrapperField,
- useRecordContext,
- useTranslate,
- useNotify,
- useListContext,
- FunctionField,
- TextField,
- NumberField,
- DateField,
- BooleanField,
- ReferenceField,
- TextInput,
- DateTimeInput,
- DateInput,
- SelectInput,
- NumberInput,
- ReferenceInput,
- ReferenceArrayInput,
- AutocompleteInput,
- DeleteButton,
- useGetRecordId,
-} from 'react-admin';
-import { Box, Typography, Card, Stack } from '@mui/material';
-import { styled } from '@mui/material/styles';
-import WaitPakinItemCreate from "./WaitPakinItemCreate";
-import WaitPakinItemPanel from "./WaitPakinItemPanel";
-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 { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, DEFAULT_ITEM_PAGE_SIZE } from '@/config/setting';
-import * as Common from '@/utils/common';
-
-const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
- '& .css-1vooibu-MuiSvgIcon-root': {
- height: '.9em'
- },
- '& .RaDatagrid-row': {
- cursor: 'auto'
- },
- '& .column-name': {
- },
- '& .opt': {
- width: 200
- },
-}));
-
-const filters = [
- <SearchInput source="condition" alwaysOn />,
- <NumberInput source="pakinId" label="table.field.waitPakinItem.pakinId" />,
- <TextInput source="maktx" label="table.field.waitPakinItem.maktx" />,
- <NumberInput source="matnrId" label="table.field.waitPakinItem.matnrId" />,
- <TextInput source="matnrCode" label="table.field.waitPakinItem.matnrCode" />,
- <NumberInput source="anfme" label="table.field.waitPakinItem.anfme" />,
- <NumberInput source="workQty" label="table.field.waitPakinItem.workQty" />,
- <TextInput source="unit" label="table.field.waitPakinItem.unit" />,
- <TextInput source="fieldsIndex" label="table.field.waitPakinItem.fieldsIndex" />,
- <NumberInput source="qty" label="table.field.waitPakinItem.qty" />,
- <TextInput source="batch" label="table.field.waitPakinItem.batch" />,
- <TextInput label="common.field.memo" source="memo" />,
- <SelectInput
- label="common.field.status"
- source="status"
- choices={[
- { id: '1', name: 'common.enums.statusTrue' },
- { id: '0', name: 'common.enums.statusFalse' },
- ]}
- resettable
- />,
-]
-
-const WaitPakinItemList = () => {
- const translate = useTranslate();
- const [createDialog, setCreateDialog] = useState(false);
- const [drawerVal, setDrawerVal] = useState(false);
- const pakinId = useGetRecordId();
-
- return (
- <Box display="flex">
- <List
- resource="waitPakinItem"
- filter={{pakinId: pakinId}}
- sx={{
- flexGrow: 1,
- transition: (theme) =>
- theme.transitions.create(['all'], {
- duration: theme.transitions.duration.enteringScreen,
- }),
- marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
- }}
- title={"menu.waitPakinItem"}
- empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
- filters={filters}
- sort={{ field: "create_time", order: "desc" }}
- actions={(
- <TopToolbar>
- <FilterButton />
- {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
- <SelectColumnsButton preferenceKey='waitPakinItem' />
- <MyExportButton />
- </TopToolbar>
- )}
- perPage={DEFAULT_ITEM_PAGE_SIZE}
- >
- <StyledDatagrid
- preferenceKey='waitPakinItem'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
- rowClick={(id, resource, record) => false}
- omit={['id', 'createTime', 'createBy', 'memo']}
- >
- <NumberField source="id" />
- <NumberField source="pakinId" label="table.field.waitPakinItem.pakinId" />
- <TextField source="maktx" label="table.field.waitPakinItem.maktx" />
- <NumberField source="matnrId" label="table.field.waitPakinItem.matnrId" />
- <TextField source="matnrCode" label="table.field.waitPakinItem.matnrCode" />
- <NumberField source="anfme" label="table.field.waitPakinItem.anfme" />
- <NumberField source="workQty" label="table.field.waitPakinItem.workQty" />
- <TextField source="unit" label="table.field.waitPakinItem.unit" />
- <TextField source="fieldsIndex" label="table.field.waitPakinItem.fieldsIndex" />
- <NumberField source="qty" label="table.field.waitPakinItem.qty" />
- <TextField source="batch" label="table.field.waitPakinItem.batch" />
- <TextField source="updateBy$" label="common.field.updateBy" />
- <DateField source="updateTime" label="common.field.updateTime" showTime />
- <TextField source="createBy$" label="common.field.createBy" />
- <TextField source="flagDefect" label="common.field.createBy" />
- <DateField source="createTime" label="common.field.createTime" showTime />
- <BooleanField source="statusBool" label="common.field.status" sortable={false} />
- <TextField source="memo" label="common.field.memo" sortable={false} />
- </StyledDatagrid>
- </List>
- <WaitPakinItemCreate
- open={createDialog}
- setOpen={setCreateDialog}
- />
- <PageDrawer
- title='WaitPakinItem Detail'
- drawerVal={drawerVal}
- setDrawerVal={setDrawerVal}
- >
- </PageDrawer>
- </Box>
- )
-}
-
-export default WaitPakinItemList;
diff --git a/rsf-admin/src/page/waitPakinItem/WaitPakinItemPanel.jsx b/rsf-admin/src/page/waitPakinItem/WaitPakinItemPanel.jsx
deleted file mode 100644
index 80d742e..0000000
--- a/rsf-admin/src/page/waitPakinItem/WaitPakinItemPanel.jsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import React, { useState, useRef, useEffect, useMemo } from "react";
-import { Box, Card, CardContent, Grid, Typography, Tooltip } from '@mui/material';
-import {
- useTranslate,
- useRecordContext,
-} from 'react-admin';
-import PanelTypography from "../components/PanelTypography";
-import * as Common from '@/utils/common'
-
-const WaitPakinItemPanel = () => {
- const record = useRecordContext();
- if (!record) return null;
- const translate = useTranslate();
- return (
- <>
- <Card sx={{ width: { xs: 300, sm: 500, md: 600, lg: 800 }, margin: 'auto' }}>
- <CardContent>
- <Grid container spacing={2}>
- <Grid item xs={12} sx={{ display: 'flex', justifyContent: 'space-between' }}>
- <Typography variant="h6" gutterBottom align="left" sx={{
- maxWidth: { xs: '100px', sm: '180px', md: '260px', lg: '360px' },
- whiteSpace: 'nowrap',
- overflow: 'hidden',
- textOverflow: 'ellipsis',
- }}>
- {Common.camelToPascalWithSpaces(translate('table.field.waitPakinItem.id'))}: {record.id}
- </Typography>
- {/* inherit, primary, secondary, textPrimary, textSecondary, error */}
- <Typography variant="h6" gutterBottom align="right" >
- ID: {record.id}
- </Typography>
- </Grid>
- </Grid>
- <Grid container spacing={2}>
- <Grid item xs={12} container alignContent="flex-end">
- <Typography variant="caption" color="textSecondary" sx={{ wordWrap: 'break-word', wordBreak: 'break-all' }}>
- {Common.camelToPascalWithSpaces(translate('common.field.memo'))}:{record.memo}
- </Typography>
- </Grid>
- </Grid>
- <Box height={20}> </Box>
- <Grid container spacing={2}>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.waitPakinItem.pakinId"
- property={record.pakinId}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.waitPakinItem.maktx"
- property={record.maktx}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.waitPakinItem.matnrId"
- property={record.matnrId}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.waitPakinItem.matnrCode"
- property={record.matnrCode}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.waitPakinItem.anfme"
- property={record.anfme}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.waitPakinItem.workQty"
- property={record.workQty}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.waitPakinItem.unit"
- property={record.unit}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.waitPakinItem.fieldsIndex"
- property={record.fieldsIndex}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.waitPakinItem.qty"
- property={record.qty}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.waitPakinItem.batch"
- property={record.batch}
- />
- </Grid>
-
- </Grid>
- </CardContent>
- </Card >
- </>
- );
-};
-
-export default WaitPakinItemPanel;
diff --git a/rsf-admin/src/page/waitPakinItem/index.jsx b/rsf-admin/src/page/waitPakinItem/index.jsx
deleted file mode 100644
index 656424d..0000000
--- a/rsf-admin/src/page/waitPakinItem/index.jsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import React, { useState, useRef, useEffect, useMemo } from "react";
-import {
- ListGuesser,
- EditGuesser,
- ShowGuesser,
-} from "react-admin";
-
-import WaitPakinItemList from "./WaitPakinItemList";
-import WaitPakinItemEdit from "./WaitPakinItemEdit";
-
-export default {
- list: WaitPakinItemList,
- edit: WaitPakinItemEdit,
- show: ShowGuesser,
- recordRepresentation: (record) => {
- return `${record.id}`
- }
-};
--
Gitblit v1.9.1