From 92144eea8842538d09305fac91a7bb01c5451cac Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 03 七月 2025 12:37:39 +0800
Subject: [PATCH] no message

---
 rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx |   67 +++++++++++++++++----------------
 1 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
index 177fce8..acf72ae 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
@@ -106,7 +106,6 @@
             ...prevData,
             [name]: value
         }));
-        console.log(formData);
     };
 
     const resetData = () => {
@@ -123,7 +122,7 @@
     const setFinally = () => {
         const rows = tableRef.current.state.editRows;
         for (const key in rows) {
-            const find = tabelData.find(item => item.matnrId === +key);
+            const find = tabelData.find(item => item.id === +key);
             find.anfme = rows[key].anfme.value;
         }
         setTableData([...tabelData]);
@@ -201,7 +200,7 @@
 
 
     const handleDeleteItem = () => {
-        const newTableData = _.filter(tabelData, (item) => !selectedRows.includes(item.matnrId));
+        const newTableData = _.filter(tabelData, (item) => !selectedRows.includes(item.id));
         setTableData(newTableData);
     }
 
@@ -344,7 +343,6 @@
         } = await request.post("companys/page", parmas);
         if (code === 200) {
             setFormData(data.records)
-            console.log(data.records)
         } else {
             notify(msg);
         }
@@ -370,7 +368,6 @@
                         value: selectedSupplier.id,
                     });
                 }
-
             }
 
             }
@@ -448,7 +445,6 @@
         } = await request.post("companys/page", parmas);
         if (code === 200) {
             setFormData(data.records)
-            console.log(data.records)
         } else {
             notify(msg);
         }
@@ -542,14 +538,6 @@
             ),
             headerClassName: "custom",
         },
-        // {
-        //     field: 'packName',
-        //     headerName: translate('table.field.asnOrderItem.packName'),
-        //     minWidth: 100,
-        //     flex: 1,
-        //     editable: true,
-        // },
-
         {
             field: 'platItemId',
             headerName: translate('table.field.asnOrderItem.platItemId') + "*",
@@ -557,6 +545,15 @@
             flex: 1,
             editable: true,
             headerClassName: "custom",
+        },
+        {
+            field: 'splrBatch',
+            headerName: translate('table.field.asnOrderItem.splrBatch'),
+            minWidth: 100,
+            flex: 1,
+            editable: true,
+            headerClassName: "custom",
+
         },
 
         // {
@@ -591,16 +588,13 @@
         //     flex: 1,
         //     editable: true,
         // },
-        {
-            field: 'purUnit',
-            headerName: translate('table.field.asnOrderItem.purUnit'),
-            minWidth: 100,
-            flex: 1,
-            editable: false,
-        },
-
-
-
+        // {
+        //     field: 'purUnit',
+        //     headerName: translate('table.field.asnOrderItem.purUnit'),
+        //     minWidth: 100,
+        //     flex: 1,
+        //     editable: false,
+        // },
     ])
 
     const action = {
@@ -615,7 +609,6 @@
                 </IconButton>
             </Tooltip>
         ),
-
     }
 
     let cdata = useRef([]);
@@ -636,7 +629,17 @@
         } = await request.get("/fields/enable/list");
         if (code === 200) {
             const cols = data.map(el => ({
-                field: el.fields,
+                field:  el.fields,
+                valueGetter: (value, row) => {
+                    if (value != null && value != undefined) {
+                        return value;
+                    }
+                    if (row.extendFields == null  ||row.extendFields[el.fields] == null) {
+                        return ''
+                    } else {
+                        return `${row.extendFields[el.fields] == null ? '' : row.extendFields[el.fields]}`;
+                    }
+                },
                 headerName: el.fieldsAlise,
                 minWidth: 100,
                 flex: 1,
@@ -648,17 +651,15 @@
         }
     }
 
-
-
     const handleDelete = (row) => {
-        const newData = _.filter(cdata.current, (item) => item.matnrId !== row.matnrId);
+        const newData = _.filter(cdata.current, (item) => item.id !== row.id);
         setTableData(newData);
     };
 
 
     const processRowUpdate = (newRow, oldRow) => {
         const rows = tabelData.map((r) =>
-            r.matnrId === newRow.matnrId ? { ...newRow } : r
+            r.id === newRow.id ? { ...newRow } : r
         )
         setTableData(rows)
         // setTableData((prevData) =>
@@ -672,7 +673,7 @@
     };
 
 
-    const handleSelectionChange = (ids) => {
+    const handleSelectionChange = (ids) => {        
         setSelectedRows(ids)
 
     };
@@ -687,7 +688,7 @@
                 rows={tabelData}
                 columns={columns}
                 disableRowSelectionOnClick
-                getRowId={(row) => row.matnrId}
+                getRowId={(row) => row.id}
                 disableColumnFilter
                 disableColumnSelector
                 disableColumnSorting
@@ -700,7 +701,7 @@
                         },
                     },
                 }}
-                pageSizeOptions={[10, 25, 50, 100]}
+                pageSizeOptions={[15, 25, 50, 100]}
                 editMode="row"
                 checkboxSelection
                 onRowSelectionModelChange={handleSelectionChange}

--
Gitblit v1.9.1