From 60f974487c6212f4cf0604dcd69ef54196031c05 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 18 四月 2025 13:42:03 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
index 438bd7e..f1aae39 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
@@ -97,7 +97,6 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
-
<TextInput source="name" label="table.field.matnr.name" alwaysOn />,
<TextInput source="code" label="table.field.matnr.code" alwaysOn />,
<ReferenceInput source="shipperId$" label="table.field.matnr.shipperId" reference="shipper">
@@ -214,7 +213,17 @@
<PrintButton />
</WrapperField>
setColumns([...arr, ...fields, opt]);
-
+
+ //filters娣诲姞杩囨护瀛楁
+ data.map(el => {
+ var i =0;
+ filters.map((item) =>{
+ if(item.key === el.fields){
+ i = 1;
+ }
+ })
+ i===0 && filters.push(<TextInput key={el.fields} source={el.fields} label={el.fieldsAlise} />)
+ })
} else {
notify(msg);
}
@@ -265,7 +274,6 @@
const MatnrList = () => {
const translate = useTranslate();
-
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
const notify = useNotify();
@@ -501,7 +509,7 @@
<PrintModal
open={createDialog}
setOpen={setCreateDialog}
- rows={[record]}
+ rows={[record.id]}
/>
</>
)
--
Gitblit v1.9.1