From 8f5cdc2bae1ca3ebbe79db52b54591e8a0fb9321 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 17 四月 2025 16:25:05 +0800 Subject: [PATCH] 问题修复 --- rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx b/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx index 03e1721..f9b848c 100644 --- a/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx +++ b/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx @@ -36,15 +36,11 @@ } from 'react-admin'; import { Box, Typography, Card, Stack } from '@mui/material'; 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 { 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'; @@ -69,6 +65,9 @@ const filters = [ <SearchInput source="condition" alwaysOn />, + <ReferenceInput source="isptStatus" label="table.field.qlyInspect.isptStatus" reference="dictData" filter={{ dictTypeCode: 'sys_qly_inspect_status' }} alwaysOn> + <AutocompleteInput source="value" optionText='label' optionValue="value" label="table.field.qlyInspect.isptStatus"></AutocompleteInput> + </ReferenceInput>, <TextInput source="code" label="table.field.qlyInspect.code" />, <TextInput source="wkType" label="table.field.qlyInspect.wkType" />, <NumberInput source="safeQty" label="table.field.qlyInspect.safeQty" />, @@ -95,6 +94,7 @@ return ( <Box display="flex"> <List + resource="qlyInspect" sx={{ flexGrow: 1, transition: (theme) => @@ -152,9 +152,9 @@ <InspectionButton /> <CompleteButton /> <CloseButton /> - </WrapperField> - </StyledDatagrid> - </List> + </WrapperField> + </StyledDatagrid> + </List> {/* <QlyInspectCreate open={createDialog} setOpen={setCreateDialog} @@ -182,17 +182,16 @@ const [createDialog, setCreateDialog] = useState(false); return ( - <> + record.isptStatus != 1 && record.isptStatus != 3 ? (<> <Button onClick={() => setCreateDialog(true)} label={"toolbar.quality"}> <ConstructionIcon /> </Button> - <InspectModal open={createDialog} setOpen={setCreateDialog} ispectId={record.id} /> - </> + </>) : (<></>) ) } @@ -202,7 +201,6 @@ 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() @@ -211,11 +209,10 @@ } } - return ( - <Button onClick={requestComplete} label={"toolbar.complete"} mutationMode={OPERATE_MODE}> + record.isptStatus != 1 && record.isptStatus != 3 ? (<Button onClick={requestComplete} label={"toolbar.complete"} mutationMode={OPERATE_MODE}> <TaskIcon /> - </Button> + </Button>) : (<></>) ) } @@ -259,8 +256,6 @@ <AddIcon /> </Button> } - - <AsnSelModal open={createDialog} setOpen={setCreateDialog} -- Gitblit v1.9.1