From ed1f6cfe669199976cf9f4423ee4e7b440549016 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 14 四月 2025 12:47:32 +0800
Subject: [PATCH] #修改 1. 组拖问题修复
---
rsf-admin/src/page/qlyInspect/QlyInspectList.jsx | 103 +++++++++++++++++++++++++--------------------------
1 files changed, 51 insertions(+), 52 deletions(-)
diff --git a/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx b/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
index a078748..6eebda5 100644
--- a/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
+++ b/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
@@ -51,7 +51,8 @@
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'
@@ -68,14 +69,12 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
-
<TextInput source="code" label="table.field.qlyInspect.code" />,
<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"
@@ -90,9 +89,8 @@
const QlyInspectList = () => {
const translate = useTranslate();
-
- const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
+ const [opCreateDialog, setOpCreateDialog] = useState(false);
return (
<Box display="flex">
@@ -106,12 +104,19 @@
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 />
<SelectColumnsButton preferenceKey='qlyInspect' />
<MyExportButton />
@@ -122,43 +127,41 @@
<StyledDatagrid
preferenceKey='qlyInspect'
bulkActionButtons={<BulkDeleteButton mutationMode={OPERATE_MODE} />}
- rowClick={(id, resource, record) => false}
- expand={() => <QlyInspectPanel />}
+ rowClick={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'asnId']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'asnId', 'statusBool']}
>
<NumberField source="id" />
- <NumberField source="asnId" label="table.field.qlyInspect.asnId" />
- <NumberField source="asnCode" label="table.field.qlyInspect.asnCode" />
<TextField source="code" label="table.field.qlyInspect.code" />
<TextField source="isptStatus$" label="table.field.qlyInspect.isptStatus" />
- <TextField source="wkType" label="table.field.qlyInspect.wkType" />
+ <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" />
-
- <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
+ <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">
- {/* <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} /> */}
+ <EditButton />
<InspectionButton />
<CompleteButton />
<CloseButton />
- </WrapperField>
- </StyledDatagrid>
- </List>
- <QlyInspectCreate
+ </WrapperField>
+ </StyledDatagrid>
+ </List>
+ {/* <QlyInspectCreate
open={createDialog}
setOpen={setCreateDialog}
+ /> */}
+ <QlyInspectOpCreate
+ open={opCreateDialog}
+ setOpen={setOpCreateDialog}
/>
<PageDrawer
title='QlyInspect Detail'
@@ -166,9 +169,7 @@
setDrawerVal={setDrawerVal}
>
</PageDrawer>
-
-
- </Box>
+ </Box >
)
}
@@ -178,26 +179,20 @@
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
- const inspection = () => {
- // requestInspect([record])
- };
-
- // const requestInspect = async (rows) => {
- // const { data: { code, data, msg } } = await request.post(`/asnOrder/inspect`, rows);
-
- // if (code === 200) {
- // notify(msg);
- // refresh()
- // } else {
- // notify(msg);
- // }
- // }
-
+ const [createDialog, setCreateDialog] = useState(false);
return (
- <Button onClick={inspection} label={"toolbar.quality"}>
- <ConstructionIcon />
- </Button>
+ <>
+ <Button onClick={() => setCreateDialog(true)} label={"toolbar.quality"}>
+ <ConstructionIcon />
+ </Button>
+
+ <InspectModal
+ open={createDialog}
+ setOpen={setCreateDialog}
+ ispectId={record.id}
+ />
+ </>
)
}
@@ -218,7 +213,7 @@
return (
- <Button onClick={requestComplete} label={"toolbar.complete"}>
+ <Button onClick={requestComplete} label={"toolbar.complete"} mutationMode={OPERATE_MODE}>
<TaskIcon />
</Button>
)
@@ -248,19 +243,23 @@
)
}
-const AsnCreatButton = () => {
+const AsnCreatButton = ({ isInit }) => {
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
const [createDialog, setCreateDialog] = useState(false);
-
-
return (
<>
- <Button onClick={() => setCreateDialog(true)} label={"toolbar.asnCreate"}>
- <AddIcon />
- </Button>
+ {
+ 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}
--
Gitblit v1.9.1