From 273f2e5d3941b0e720e5eabd7dba9cfc042c3267 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 17 六月 2025 17:04:53 +0800
Subject: [PATCH] 出库单生成波次功能开发

---
 rsf-admin/src/page/orders/outStock/OutStockPublic.jsx |   46 +++++++++++++++++++++++++---------------------
 1 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx b/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx
index 60c2172..ce732be 100644
--- a/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx
@@ -58,9 +58,11 @@
     '& .column-maktx': {
         width: 200
     },
-    '& .RaBulkActionsToolbar-toolbar': {
-        display: 'none'
-    }
+
+    mt: '60px'
+    // '& .RaBulkActionsToolbar-toolbar': {
+    //     display: 'none'
+    // }
 
 }));
 
@@ -88,19 +90,20 @@
     }, [selectedMatnr])
 
 
-    const handleRowClick = (id, resource, record) => {
-        setRowSelectedIds(prev =>
-            prev.includes(id)
-                ? prev.filter(item => item !== id)  // 鍙栨秷閫夋嫨
-                : [...prev, id]                     // 娣诲姞閫夋嫨
-        );
+    const ComfirmButton = () => {
+        const { selectedIds, data } = useListContext();
+        const handleRowClick = () => {
+            const ids = data.filter(item => selectedIds.includes(item.id)).map(item => item.id);
+            setRowSelectedIds(ids);
+            const mas = data.filter(item => selectedIds.includes(item.id)).map(item => item.matnrCode);
+            //璁剧疆搴撲綅淇℃伅绛涢�夋潯浠�
+            setSelectedMatnr(mas);
+        }
 
-        //璁剧疆搴撲綅淇℃伅绛涢�夋潯浠�
-        setSelectedMatnr(prev =>
-            prev.includes(record?.matnrCode)
-                ? prev.filter(item => item !== record?.matnrCode)  // 鍙栨秷閫夋嫨
-                : [...prev, record?.matnrCode]                     // 娣诲姞閫夋嫨
-        );
+        return (
+            <Button label="toolbar.confirm" size="medium" onClick={handleRowClick} />
+        )
+
     };
 
     const handleClickOpen = () => {
@@ -191,6 +194,7 @@
                                 filter={{ asnId: record?.id, deleted: 0 }}
                                 sort={{ field: "create_time", order: "desc" }}
                                 actions={false}
+                                pagination={false}
                                 perPage={DEFAULT_ITEM_PAGE_SIZE}
                             >
                                 <LinearProgress
@@ -199,9 +203,9 @@
                                 <StyledDatagrid
                                     storeKey={"outStockPublic"}
                                     preferenceKey='outStockItem'
-                                    bulkActionButtons={<></>}
-                                    rowClick={handleRowClick}
-                                    selectedIds={rowSelectedIds}
+                                    bulkActionButtons={<>
+                                        <ComfirmButton />
+                                    </>}
                                     omit={['id', 'splrName', 'qty', 'poCode',]}
                                 >
                                     <NumberField source="id" />
@@ -269,7 +273,8 @@
         { field: 'batch', headerName: '鎵规', width: 90 },
         { field: 'unit', headerName: '鍗曚綅', width: 60 },
         { field: 'outQty', headerName: '鍑哄簱鏁伴噺', width: 110, },
-        { field: 'anfme', headerName: '搴撳瓨鏁伴噺', width: 110,
+        {
+            field: 'anfme', headerName: '搴撳瓨鏁伴噺', width: 110,
             renderCell: (params) => (
                 <OutStockAnfme value={params.value} />
             )
@@ -449,11 +454,10 @@
     }
     return (
         <ConfirmButton
-            label="toolbar.confirm"
+            label="toolbar.allComfirm"
             variant="contained"
             size="medium"
             onConfirm={submit}
-            startIcon={<ConfirmationNumberOutlinedIcon />}
         />
     )
 }

--
Gitblit v1.9.1