From aeacc7f80e3ae74cc56be90bb761e9a6b935f643 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 13 五月 2025 14:49:31 +0800
Subject: [PATCH] 收货流程修改 质检流程修改

---
 rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx |   31 ++++++++++++++++++-------------
 1 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
index 177fce8..6899c39 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
@@ -123,7 +123,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 +201,7 @@
 
 
     const handleDeleteItem = () => {
-        const newTableData = _.filter(tabelData, (item) => !selectedRows.includes(item.matnrId));
+        const newTableData = _.filter(tabelData, (item) => !selectedRows.includes(item.id));
         setTableData(newTableData);
     }
 
@@ -370,7 +370,6 @@
                         value: selectedSupplier.id,
                     });
                 }
-
             }
 
             }
@@ -598,9 +597,6 @@
             flex: 1,
             editable: false,
         },
-
-
-
     ])
 
     const action = {
@@ -615,7 +611,6 @@
                 </IconButton>
             </Tooltip>
         ),
-
     }
 
     let cdata = useRef([]);
@@ -636,7 +631,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 +653,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) =>
@@ -673,6 +676,8 @@
 
 
     const handleSelectionChange = (ids) => {
+        console.log(ids);
+        
         setSelectedRows(ids)
 
     };
@@ -687,7 +692,7 @@
                 rows={tabelData}
                 columns={columns}
                 disableRowSelectionOnClick
-                getRowId={(row) => row.matnrId}
+                getRowId={(row) => row.id}
                 disableColumnFilter
                 disableColumnSelector
                 disableColumnSorting

--
Gitblit v1.9.1