From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 16:35:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx b/rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx
index 56e5e25..49e1601 100644
--- a/rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx
+++ b/rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx
@@ -70,6 +70,9 @@
<TextInput source="splrName" label="table.field.qlyIsptItem.splrName" />,
<TextInput source="splrBatch" label="table.field.qlyIsptItem.splrBatch" />,
<TextInput source="stockBatch" label="table.field.qlyIsptItem.stockBatch" />,
+ <TextInput source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
+ <TextInput source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
+ <TextInput source="projectCode" label="table.field.asnOrderItem.projectCode" />,
<NumberInput source="rcptQty" label="table.field.qlyIsptItem.rcptQty" />,
<NumberInput source="dlyQty" label="table.field.qlyIsptItem.dlyQty" />,
<NumberInput source="disQty" label="table.field.qlyIsptItem.disQty" />,
@@ -102,14 +105,6 @@
storeKey="qlyIsptItem"
resource="qlyIsptItem"
filter={{ ispectId: isptId }}
- sx={{
- flexGrow: 1,
- transition: (theme) =>
- theme.transitions.create(['all'], {
- duration: theme.transitions.duration.enteringScreen,
- }),
- marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
- }}
title={"menu.qlyIsptItem"}
empty={false}
filters={filters}
@@ -171,6 +166,9 @@
<TextField source="label" label="table.field.qlyIsptItem.label" />,
<TextField source="splrBatch" label="table.field.qlyIsptItem.splrBatch" />,
<TextField source="stockBatch" label="table.field.qlyIsptItem.stockBatch" />,
+ <TextField source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
+ <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
+ <TextField source="projectCode" label="table.field.asnOrderItem.projectCode" />,
<NumberField source="rcptQty" label="table.field.qlyIsptItem.rcptQty" />,
<NumberField source="dlyQty" label="table.field.qlyIsptItem.dlyQty" />,
<MyField source="anfme" label="table.field.qlyIsptItem.anfme"
@@ -219,7 +217,7 @@
preferenceKey='qlyIsptItem'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={false}
- omit={['id', 'createTime', 'createBy', 'memo', 'dlyQty', 'label', 'stockBatch', 'picPath', 'ispectId', 'statusBool']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'dlyQty', 'label', 'stockBatch', 'picPath', 'ispectId', 'statusBool', 'platWorkCode', 'projectCode']}
>
{columns.map((column) => column)}
--
Gitblit v1.9.1