From 2da12c3d55a709241d245d0ca6a22b56e4c048a0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 09 四月 2025 14:04:19 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/asnOrder/AsnWareModal.jsx | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/rsf-admin/src/page/asnOrder/AsnWareModal.jsx b/rsf-admin/src/page/asnOrder/AsnWareModal.jsx
index d4591f8..bf73182 100644
--- a/rsf-admin/src/page/asnOrder/AsnWareModal.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnWareModal.jsx
@@ -36,7 +36,8 @@
const [formData, setFormData] = useState({
name: '',
- code: ''
+ code: '',
+ groupId: 0
});
const [tableData, setTableData] = useState([]);
@@ -54,7 +55,8 @@
const reset = () => {
setFormData({
name: '',
- code: ''
+ code: '',
+ groupId: 0
})
}
@@ -69,7 +71,7 @@
return {
matnrId: el.id,
maktx: el.name,
- maktxCode: el.code,
+ matnrCode: el.code,
stockUnit: el.stockUnit || '',
purUnit: el.purchaseUnit || '',
...dynamicFields
@@ -84,7 +86,7 @@
const res = await request.post(`/matnr/page`, {
...formData,
current: 1,
- pageSize: 199,
+ pageSize: 100,
orderBy: "create_time desc"
});
if (res?.data?.code === 200) {
@@ -191,7 +193,7 @@
const [columns, setColumns] = useState([
// { field: 'id', headerName: 'ID', width: 100 },
{ field: 'name', headerName: translate('table.field.matnr.name'), width: 300 },
- { field: 'code', headerName: translate('table.field.matnr.code'), width: 100 },
+ { field: 'code', headerName: translate('table.field.matnr.code'), width: 200 },
{ field: 'groupId$', headerName: translate('table.field.matnr.groupId'), width: 100 },
{ field: 'spec', headerName: translate('table.field.matnr.spec'), width: 100 },
{ field: 'model', headerName: translate('table.field.matnr.model'), width: 100 },
--
Gitblit v1.9.1