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/QlyInspectPanel.jsx | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx b/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx
index 6abfaa5..427d182 100644
--- a/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx
+++ b/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx
@@ -47,13 +47,19 @@
},
{
field: 'matnrCode',
- headerName: translate('table.field.qlyIsptItem.matnrCode')
+ headerName: translate('table.field.qlyIsptItem.matnrCode'),
+ width: 200
},
{
field: 'maktx',
headerName: translate('table.field.qlyIsptItem.maktx'),
width: 200
},
+ // {
+ // field: 'trackCode',
+ // headerName: translate('table.field.qlyIsptItem.trackCode'),
+ // width: 200
+ // },
// {
// field: 'label',
// headerName: translate('table.field.qlyIsptItem.label')
@@ -91,9 +97,13 @@
headerName: translate('table.field.qlyIsptItem.safeQty')
},
{
- field: 'picPath',
- headerName: translate('table.field.qlyIsptItem.picPath')
- }
+ field: 'isptResult$',
+ headerName: translate('table.field.qlyIsptItem.isptResult')
+ },
+ // {
+ // field: 'picPath',
+ // headerName: translate('table.field.qlyIsptItem.picPath')
+ // }
];
const maktxChange = (value) => {
@@ -107,7 +117,7 @@
}}>
<div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: '4px', alignItems: 'center' }}>
- <TextField value={maktx} onChange={(e) => maktxChange(e.target.value)} label="鎼滅储鐗╂枡" variant="outlined" sx={{ width: '300px' }} />
+ <TextField value={maktx} onChange={(e) => maktxChange(e.target.value)} label="鎼滅储鐗╂枡" variant="outlined" sx={{ width: '300px' }} size="small" />
<div style={{ display: 'flex', gap: '10px' }}>
</div>
--
Gitblit v1.9.1