From aa94600e75403b21af50dce1e8c8041f73cf0a29 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期一, 31 三月 2025 09:37:22 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx b/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx
index 785ba88..6d78dcc 100644
--- a/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx
+++ b/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx
@@ -23,7 +23,7 @@
overflow: 'hidden',
textOverflow: 'ellipsis',
}}>
- {Common.camelToPascalWithSpaces(translate('table.field.qlyInspect.name'))}: {record.name}
+ {Common.camelToPascalWithSpaces(translate('table.field.qlyInspect.id'))}: {record.id}
</Typography>
{/* inherit, primary, secondary, textPrimary, textSecondary, error */}
<Typography variant="h6" gutterBottom align="right" >
@@ -42,32 +42,20 @@
<Grid container spacing={2}>
<Grid item xs={6}>
<PanelTypography
- title="table.field.qlyInspect.code"
- property={record.code}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.qlyInspect.name"
- property={record.name}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.qlyInspect.barcode"
- property={record.barcode}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
title="table.field.qlyInspect.asnItemId"
property={record.asnItemId}
/>
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.qlyInspect.poItemId"
- property={record.poItemId}
+ title="table.field.qlyInspect.code"
+ property={record.code}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.qlyInspect.wkType"
+ property={record.wkType}
/>
</Grid>
<Grid item xs={6}>
@@ -78,8 +66,20 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.qlyInspect.disQty"
- property={record.disQty}
+ title="table.field.qlyInspect.dlyQty"
+ property={record.dlyQty}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.qlyInspect.rcptQty"
+ property={record.rcptQty}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.qlyInspect.isptQty"
+ property={record.isptQty}
/>
</Grid>
--
Gitblit v1.9.1