From 8e622d6a1d07937cd654364748b52e15a50c67d8 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 14 五月 2025 09:14:43 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx b/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx index f9b848c..44c3407 100644 --- a/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx +++ b/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx @@ -116,7 +116,7 @@ actions={( <TopToolbar> <AsnCreatButton /> - <MyCreateButton onClick={() => { setOpCreateDialog(true) }} /> + {/* <MyCreateButton onClick={() => { setOpCreateDialog(true) }} /> */} <FilterButton /> <SelectColumnsButton preferenceKey='qlyInspect' /> <MyExportButton /> @@ -137,9 +137,6 @@ <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 /> @@ -148,7 +145,7 @@ <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 /> @@ -174,6 +171,12 @@ } export default QlyInspectList; + +const PrintLabelButton = () => { + const record = useRecordContext(); + + +} const InspectionButton = () => { const record = useRecordContext(); @@ -231,7 +234,6 @@ notify(msg); } } - return ( <Button onClick={requestClose} label={"toolbar.close"}> -- Gitblit v1.9.1