From e411a471a08717964937be2e6ac0eadaa84961ca Mon Sep 17 00:00:00 2001
From: DESKTOP-LMJ82IJ\Eno <creaycat@gmail.com>
Date: 星期日, 13 四月 2025 18:39:36 +0800
Subject: [PATCH] #修改 1. 组拖界面优化
---
rsf-admin/src/page/qlyInspect/QlyInspectList.jsx | 166 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 142 insertions(+), 24 deletions(-)
diff --git a/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx b/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
index 591d778..76c6410 100644
--- a/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
+++ b/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
@@ -31,6 +31,8 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
+ Button,
+ useRefresh,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -43,7 +45,14 @@
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";
+import CloseIcon from "@mui/icons-material/Close";
+import TaskIcon from '@mui/icons-material/Task';
+import AddIcon from '@mui/icons-material/Add';
+import request from '@/utils/request';
+import AsnSelModal from "./AsnSelModal";
+import InspectModal from "./InspectModal";
+import QlyInspectOpCreate from './QlyInspectOpCreate';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
height: '.9em'
@@ -60,12 +69,12 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
- <DateInput label='common.time.after' source="timeStart" alwaysOn />,
- <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
-
<TextInput source="code" label="table.field.qlyInspect.code" />,
- <TextInput source="name" label="table.field.qlyInspect.name" />,
-
+ <TextInput source="wkType" label="table.field.qlyInspect.wkType" />,
+ <NumberInput source="safeQty" label="table.field.qlyInspect.safeQty" />,
+ <NumberInput source="dlyQty" label="table.field.qlyInspect.dlyQty" />,
+ <NumberInput source="rcptQty" label="table.field.qlyInspect.rcptQty" />,
+ <NumberInput source="isptQty" label="table.field.qlyInspect.isptQty" />,
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -80,9 +89,9 @@
const QlyInspectList = () => {
const translate = useTranslate();
-
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
+ const [opCreateDialog, setOpCreateDialog] = useState(false);
return (
<Box display="flex">
@@ -93,16 +102,23 @@
theme.transitions.create(['all'], {
duration: theme.transitions.duration.enteringScreen,
}),
- marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
+ marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.qlyInspect"}
- empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ empty={<EmptyData
+ children={
+ <Box sx={{ gap: 2, display: 'flex' }}>
+ <AsnCreatButton isInit={true} />
+ </Box>
+ }
+ onClick={() => { }} />}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
+ <AsnCreatButton />
+ <MyCreateButton onClick={() => { setOpCreateDialog(true) }} />
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
<SelectColumnsButton preferenceKey='qlyInspect' />
<MyExportButton />
</TopToolbar>
@@ -111,35 +127,42 @@
>
<StyledDatagrid
preferenceKey='qlyInspect'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
- rowClick={(id, resource, record) => false}
- expand={() => <QlyInspectPanel />}
+ bulkActionButtons={<BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ rowClick='edit'
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'asnId', 'statusBool']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.qlyInspect.code" />
- <TextField source="name" label="table.field.qlyInspect.name" />
-
- <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
+ <TextField source="isptStatus$" label="table.field.qlyInspect.isptStatus" />
+ <TextField source="wkType$" label="table.field.qlyInspect.wkType" />
+ <NumberField source="asnId" label="table.field.qlyInspect.asnId" />
+ <NumberField source="asnCode" label="table.field.qlyInspect.asnCode" />
+ <NumberField source="safeQty" label="table.field.qlyInspect.safeQty" />
+ <NumberField source="dlyQty" label="table.field.qlyInspect.dlyQty" />
+ <NumberField source="rcptQty" label="table.field.qlyInspect.rcptQty" />
+ <NumberField source="isptQty" label="table.field.qlyInspect.isptQty" />
+ <TextField source="updateBy$" label="common.field.updateBy" />
<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>
+ <TextField source="createBy$" 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} />
<WrapperField cellClassName="opt" label="common.field.opt">
- <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
- <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
+ {/* <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} /> */}
+ <InspectionButton />
+ <CompleteButton />
+ <CloseButton />
</WrapperField>
</StyledDatagrid>
</List>
<QlyInspectCreate
open={createDialog}
setOpen={setCreateDialog}
+ />
+ <QlyInspectOpCreate
+ open={opCreateDialog}
+ setOpen={setOpCreateDialog}
/>
<PageDrawer
title='QlyInspect Detail'
@@ -152,3 +175,98 @@
}
export default QlyInspectList;
+
+const InspectionButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+ const [createDialog, setCreateDialog] = useState(false);
+ const [opCreateDialog, setOpCreateDialog] = useState(false);
+
+ return (
+ <>
+ <Button onClick={() => setCreateDialog(true)} label={"toolbar.quality"}>
+ <ConstructionIcon />
+ </Button>
+
+ <InspectModal
+ open={createDialog}
+ setOpen={setCreateDialog}
+ ispectId={record.id}
+ />
+ </>
+ )
+}
+
+const CompleteButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+ const requestComplete = async () => {
+ const { data: { code, data, msg } } = await request.post(`/qlyInspect/update`, { ...record, isptStatus: '1' });
+
+ if (code === 200) {
+ notify(msg);
+ refresh()
+ } else {
+ notify(msg);
+ }
+ }
+
+
+ return (
+ <Button onClick={requestComplete} label={"toolbar.complete"}>
+ <TaskIcon />
+ </Button>
+ )
+}
+
+const CloseButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+
+ const requestClose = async () => {
+ const { data: { code, data, msg } } = await request.post(`/qlyInspect/update`, { ...record, isptStatus: '3' });
+
+ if (code === 200) {
+ notify(msg);
+ refresh()
+ } else {
+ notify(msg);
+ }
+ }
+
+
+ return (
+ <Button onClick={requestClose} label={"toolbar.close"}>
+ <CloseIcon />
+ </Button>
+ )
+}
+
+const AsnCreatButton = ({ isInit }) => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+ const [createDialog, setCreateDialog] = useState(false);
+
+ return (
+ <>
+ {
+ isInit ? <Button onClick={() => setCreateDialog(true)} label={"toolbar.asnCreate"} variant="contained"
+ color="primary">
+ <AddIcon />
+ </Button> : <Button onClick={() => setCreateDialog(true)} label={"toolbar.asnCreate"} >
+ <AddIcon />
+ </Button>
+ }
+
+
+ <AsnSelModal
+ open={createDialog}
+ setOpen={setCreateDialog}
+ />
+ </>
+ )
+}
--
Gitblit v1.9.1