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/qlyInspect/QlyInspectList.jsx | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx b/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx index 33f00db..46b4912 100644 --- a/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx +++ b/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx @@ -107,7 +107,13 @@ 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={( @@ -129,11 +135,11 @@ 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" /> @@ -244,19 +250,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