From b5e8045d5f5b5401b696db12f62fdbcc86dc5c5d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 四月 2025 11:40:02 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/taskLog/TaskLogEdit.jsx | 249 ++++++++++++++++++-------------------------------
1 files changed, 92 insertions(+), 157 deletions(-)
diff --git a/rsf-admin/src/page/taskLog/TaskLogEdit.jsx b/rsf-admin/src/page/taskLog/TaskLogEdit.jsx
index ec5c658..6c366fc 100644
--- a/rsf-admin/src/page/taskLog/TaskLogEdit.jsx
+++ b/rsf-admin/src/page/taskLog/TaskLogEdit.jsx
@@ -2,187 +2,122 @@
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 { useWatch, useFormContext, useForm } from "react-hook-form";
+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 MemoInput from "../components/MemoInput";
-import StatusSelectInput from "../components/StatusSelectInput";
+import TaskItemLogList from "./TaskItemLogList";
const FormToolbar = () => {
const { getValues } = useFormContext();
-
return (
- <Toolbar sx={{ justifyContent: 'space-between' }}>
+ <Toolbar sx={{ justifyContent: 'end' }}>
<SaveButton />
- <DeleteButton mutationMode="optimistic" />
+ {/* <DeleteButton mutationMode="optimistic" /> */}
</Toolbar>
)
}
-const TaskLogEdit = () => {
+const TaskItemLog = () => {
const translate = useTranslate();
-
return (
- <Edit
- redirect="list"
- mutationMode={EDIT_MODE}
- actions={<CustomerTopToolBar />}
- aside={<EditBaseAside />}
- >
- <SimpleForm
- shouldUnregister
- warnWhenUnsavedChanges
- toolbar={<FormToolbar />}
- mode="onTouched"
- defaultValues={{}}
- // validate={(values) => { }}
+ <>
+ <Edit
+ redirect="list"
+ mutationMode={EDIT_MODE}
+ actions={<CustomerTopToolBar />}
+ aside={<EditBaseAside />}
>
- <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.taskLog.taskId"
- source="taskId"
- autoFocus
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.taskLog.taskCode"
- source="taskCode"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.taskLog.taskStatus"
- source="taskStatus"
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.taskLog.taskType"
- source="taskType"
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.taskLog.orgLoc"
- source="orgLoc"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.taskLog.orgSite"
- source="orgSite"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.taskLog.targLoc"
- source="targLoc"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.taskLog.targSite"
- source="targSite"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.taskLog.barcode"
- source="barcode"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.taskLog.robotCode"
- source="robotCode"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.taskLog.exceStatus"
- source="exceStatus"
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.taskLog.expDesc"
- source="expDesc"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.taskLog.sort"
- source="sort"
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.taskLog.expCode"
- source="expCode"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <DateInput
- label="table.field.taskLog.startTime"
- source="startTime"
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <DateInput
- label="table.field.taskLog.endTime"
- source="endTime"
- />
- </Stack>
-
+ <SimpleForm
+ shouldUnregister
+ warnWhenUnsavedChanges
+ toolbar={<FormToolbar />}
+ mode="onTouched"
+ defaultValues={{}}
+ >
+ <Grid container width={{ xs: '100%', xl: '80%' }} rowSpacing={3} columnSpacing={3}>
+ <Grid item xs={24} md={16}>
+ <Typography variant="h6" gutterBottom>
+ {translate('common.edit.title.main')}
+ </Typography>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.task.taskCode"
+ source="taskCode"
+ readOnly
+ parse={v => v}
+ autoFocus
+ />
+ <TextInput
+ label="table.field.task.taskStatus"
+ readOnly
+ source="taskStatus$"
+ />
+ <TextInput
+ label="table.field.task.taskType"
+ source="taskType$"
+ readOnly
+ />
+ <TextInput
+ label="table.field.task.orgLoc"
+ source="orgLoc"
+ readOnly
+ parse={v => v}
+ />
+ <TextInput
+ label="table.field.task.targLoc"
+ source="targLoc"
+ readOnly
+ parse={v => v}
+ />
+ <TextInput
+ label="table.field.task.orgSite"
+ source="orgSite"
+ readOnly
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.task.targSite"
+ source="targSite"
+ readOnly
+ parse={v => v}
+ />
+ <TextInput
+ label="table.field.task.barcode"
+ source="barcode"
+ readOnly
+ parse={v => v}
+ />
+ <NumberInput
+ label="table.field.task.sort"
+ readOnly
+ source="sort"
+ />
+ </Stack>
+ </Grid>
</Grid>
- <Grid item xs={12} md={4}>
- <Typography variant="h6" gutterBottom>
- {translate('common.edit.title.common')}
- </Typography>
- <StatusSelectInput />
- <Box mt="2em" />
- <MemoInput />
- </Grid>
+ </SimpleForm>
+ </Edit >
+ <Card sx={{ marginTop: '1em', }}>
+ <Grid item xs={24} md={16} sx={{ margin: '1em' }}>
+ <Typography variant="h6" gutterBottom >
+ {translate('common.edit.title.common')}
+ </Typography>
+ <TaskItemLogList />
</Grid>
- </SimpleForm>
- </Edit >
+ </Card>
+ </>
)
}
-export default TaskLogEdit;
+export default TaskItemLog;
--
Gitblit v1.9.1