From eab76cd34bff799686f68e6b70f86c9001e4913f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 23 五月 2025 09:41:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx | 48 ++++++++++++++++++++++--------------------------
1 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx b/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx
index 03e1721..f099c0a 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';
@@ -53,6 +49,7 @@
import AsnSelModal from "./AsnSelModal";
import InspectModal from "./InspectModal";
import QlyInspectOpCreate from './QlyInspectOpCreate';
+import ConfirmButton from "../../components/ConfirmButton";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
height: '.9em'
@@ -69,6 +66,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 +95,7 @@
return (
<Box display="flex">
<List
+ resource="qlyInspect"
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -116,7 +117,7 @@
actions={(
<TopToolbar>
<AsnCreatButton />
- <MyCreateButton onClick={() => { setOpCreateDialog(true) }} />
+ {/* <MyCreateButton onClick={() => { setOpCreateDialog(true) }} /> */}
<FilterButton />
<SelectColumnsButton preferenceKey='qlyInspect' />
<MyExportButton />
@@ -133,14 +134,11 @@
>
<NumberField source="id" />
<TextField source="code" label="table.field.qlyInspect.code" />
- <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="isptStatus$" label="table.field.qlyInspect.isptStatus" />
<TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
<TextField source="createBy$" label="common.field.createBy" />
@@ -148,13 +146,13 @@
<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 />
+ <EditButton label="toolbar.detail" />
<InspectionButton />
<CompleteButton />
- <CloseButton />
- </WrapperField>
- </StyledDatagrid>
- </List>
+ {/* <CloseButton /> */}
+ </WrapperField>
+ </StyledDatagrid>
+ </List>
{/* <QlyInspectCreate
open={createDialog}
setOpen={setCreateDialog}
@@ -175,6 +173,12 @@
export default QlyInspectList;
+const PrintLabelButton = () => {
+ const record = useRecordContext();
+
+
+}
+
const InspectionButton = () => {
const record = useRecordContext();
const notify = useNotify();
@@ -182,17 +186,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}
/>
- </>
+ </>) : (<></>)
)
}
@@ -201,8 +204,7 @@
const notify = useNotify();
const refresh = useRefresh();
const requestComplete = async () => {
- const { data: { code, data, msg } } = await request.post(`/qlyInspect/update`, { ...record, isptStatus: '1' });
-
+ const { data: { code, data, msg } } = await request.post(`/qlyInspect/verify/complate/` + record?.id);
if (code === 200) {
notify(msg);
refresh()
@@ -211,11 +213,8 @@
}
}
-
return (
- <Button onClick={requestComplete} label={"toolbar.complete"} mutationMode={OPERATE_MODE}>
- <TaskIcon />
- </Button>
+ record.isptStatus == 2 ? (<ConfirmButton label={"toolbar.verifyComfirm"} color="secondary" startIcon={<TaskIcon />} onConfirm={requestComplete} />) : (<></>)
)
}
@@ -234,7 +233,6 @@
notify(msg);
}
}
-
return (
<Button onClick={requestClose} label={"toolbar.close"}>
@@ -259,8 +257,6 @@
<AddIcon />
</Button>
}
-
-
<AsnSelModal
open={createDialog}
setOpen={setCreateDialog}
--
Gitblit v1.9.1