From b62484dd3f3b3b3a07a037a597bd370fd563c439 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 25 三月 2025 15:20:05 +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 | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx b/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
index 10bda0b..a23f223 100644
--- a/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
+++ b/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
@@ -64,12 +64,11 @@
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
<TextInput source="code" label="table.field.qlyInspect.code" />,
- <TextInput source="name" label="table.field.qlyInspect.name" />,
- <TextInput source="barcode" label="table.field.qlyInspect.barcode" />,
- <NumberInput source="asnItemId" label="table.field.qlyInspect.asnItemId" />,
- <NumberInput source="poItemId" label="table.field.qlyInspect.poItemId" />,
+ <TextInput source="wkType" label="table.field.qlyInspect.wkType" />,
<NumberInput source="safeQty" label="table.field.qlyInspect.safeQty" />,
- <NumberInput source="disQty" label="table.field.qlyInspect.disQty" />,
+ <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
@@ -98,7 +97,7 @@
theme.transitions.create(['all'], {
duration: theme.transitions.duration.enteringScreen,
}),
- marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
+ marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.qlyInspect"}
empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
@@ -118,18 +117,15 @@
preferenceKey='qlyInspect'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
- expand={() => <QlyInspectPanel />}
- expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.qlyInspect.code" />
- <TextField source="name" label="table.field.qlyInspect.name" />
- <TextField source="barcode" label="table.field.qlyInspect.barcode" />
- <NumberField source="asnItemId" label="table.field.qlyInspect.asnItemId" />
- <NumberField source="poItemId" label="table.field.qlyInspect.poItemId" />
+ <TextField source="wkType" label="table.field.qlyInspect.wkType" />
<NumberField source="safeQty" label="table.field.qlyInspect.safeQty" />
- <NumberField source="disQty" label="table.field.qlyInspect.disQty" />
+ <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" />
--
Gitblit v1.9.1