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 | 36 ++++++++++++++++++++++++++---------- 1 files changed, 26 insertions(+), 10 deletions(-) diff --git a/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx b/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx index 8f56bfa..427d182 100644 --- a/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx +++ b/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx @@ -13,6 +13,7 @@ import request from '@/utils/request'; import debounce from 'lodash/debounce'; import { DataGrid } from '@mui/x-data-grid'; +import { width } from "@mui/system"; const QlyInspectPanel = () => { const record = useRecordContext(); @@ -46,16 +47,23 @@ }, { field: 'matnrCode', - headerName: translate('table.field.qlyIsptItem.matnrCode') + headerName: translate('table.field.qlyIsptItem.matnrCode'), + width: 200 }, { field: 'maktx', - headerName: translate('table.field.qlyIsptItem.maktx') + headerName: translate('table.field.qlyIsptItem.maktx'), + width: 200 }, - { - field: 'label', - headerName: translate('table.field.qlyIsptItem.label') - }, + // { + // field: 'trackCode', + // headerName: translate('table.field.qlyIsptItem.trackCode'), + // width: 200 + // }, + // { + // field: 'label', + // headerName: translate('table.field.qlyIsptItem.label') + // }, { field: 'splrName', headerName: translate('table.field.qlyIsptItem.splrName') @@ -67,6 +75,10 @@ { field: 'stockBatch', headerName: translate('table.field.qlyIsptItem.stockBatch') + }, + { + field: 'isptStatus$', + headerName: translate('table.field.qlyIsptItem.isptStatus') }, { field: 'rcptQty', @@ -85,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) => { @@ -101,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