From 875936724f2d82c6e3146f8f224bf0a26fced6c6 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 01 四月 2025 16:35:36 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx | 12 +++++++-----
rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx | 12 +++++++-----
rsf-admin/src/page/qlyInspect/InspectModal.jsx | 3 ++-
rsf-admin/src/page/qlyInspect/QlyInspectList.jsx | 2 +-
rsf-admin/src/i18n/zh.js | 2 +-
rsf-admin/src/page/asnOrder/AsnOrderModal.jsx | 6 ++----
6 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 634b4f7..aae3f75 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -432,7 +432,7 @@
},
qlyIsptItem: {
ispectId: "涓诲崟ID",
- matnrCode: "缂栧彿",
+ matnrCode: "鐗╂枡缂栧彿",
maktx: "鐗╂枡鍚嶇О",
label: "鏍囩",
splrName: "渚涘簲鍟嗗悕绉�",
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
index 33caa47..1f301cd 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
@@ -260,15 +260,13 @@
{
field: 'maktx',
headerName: translate('table.field.asnOrderItem.maktx'),
- minWidth: 100,
- flex: 1,
+ width: 250,
editable: false,
},
{
field: 'maktxCode',
headerName: translate('table.field.asnOrderItem.maktxCode'),
- minWidth: 100,
- flex: 1,
+ width: 130,
editable: false,
},
{
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
index 3153ccb..2b674ec 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
@@ -14,6 +14,7 @@
import debounce from 'lodash/debounce';
import { DataGrid } from '@mui/x-data-grid';
import PrintModal from './PrintModal';
+import { width } from "@mui/system";
const AsnOrderPanel = () => {
const record = useRecordContext();
if (!record) return null;
@@ -58,13 +59,14 @@
field: 'poDetlCode',
headerName: translate('table.field.asnOrderItem.poDetlCode')
},
- {
- field: 'matnrId',
- headerName: translate('table.field.asnOrderItem.matnrId')
- },
+ // {
+ // field: 'matnrCode',
+ // headerName: translate('table.field.asnOrderItem.matnrCode')
+ // },
{
field: 'maktx',
- headerName: translate('table.field.asnOrderItem.maktx')
+ headerName: translate('table.field.asnOrderItem.maktx'),
+ width: 200,
},
{
field: 'anfme',
diff --git a/rsf-admin/src/page/qlyInspect/InspectModal.jsx b/rsf-admin/src/page/qlyInspect/InspectModal.jsx
index 1828f2e..07880b5 100644
--- a/rsf-admin/src/page/qlyInspect/InspectModal.jsx
+++ b/rsf-admin/src/page/qlyInspect/InspectModal.jsx
@@ -214,12 +214,13 @@
const [columns, setColumns] = useState([
// { field: 'id', headerName: 'ID', width: 100 },
- { field: 'maktx', headerName: translate('table.field.qlyIsptItem.maktx'), width: 200 },
+ { field: 'maktx', headerName: translate('table.field.qlyIsptItem.maktx'), width: 300 },
{ field: 'matnrCode', headerName: translate('table.field.qlyIsptItem.matnrCode') },
{ field: 'splrName', headerName: translate('table.field.qlyIsptItem.splrName') },
{ field: 'splrBatch', headerName: translate('table.field.qlyIsptItem.splrBatch') },
{ field: 'stockBatch', headerName: translate('table.field.qlyIsptItem.stockBatch') },
{ field: 'dlyQty', headerName: translate('table.field.qlyIsptItem.dlyQty') },
+ { field: 'rcptQty', headerName: translate('table.field.qlyIsptItem.rcptQty') },
{
field: 'safeQty', headerName: translate('table.field.qlyIsptItem.safeQty'), editable: true, type: 'number',
renderHeader: () => (
diff --git a/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx b/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
index 33f00db..0cb65c3 100644
--- a/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
+++ b/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
@@ -133,7 +133,7 @@
<NumberField source="asnCode" label="table.field.qlyInspect.asnCode" />
<TextField source="code" label="table.field.qlyInspect.code" />
<TextField source="isptStatus$" label="table.field.qlyInspect.isptStatus" />
- <TextField source="wkType" label="table.field.qlyInspect.wkType" />
+ <TextField source="wkType$" label="table.field.qlyInspect.wkType" />
<NumberField source="safeQty" label="table.field.qlyInspect.safeQty" />
<NumberField source="dlyQty" label="table.field.qlyInspect.dlyQty" />
<NumberField source="rcptQty" label="table.field.qlyInspect.rcptQty" />
diff --git a/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx b/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx
index 7221f71..6abfaa5 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();
@@ -50,12 +51,13 @@
},
{
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: 'label',
+ // headerName: translate('table.field.qlyIsptItem.label')
+ // },
{
field: 'splrName',
headerName: translate('table.field.qlyIsptItem.splrName')
--
Gitblit v1.9.1