From 32286d19d0a0b347c3787f051e95f413566ab4ae Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 28 四月 2025 16:45:15 +0800
Subject: [PATCH] #找库位优化

---
 rsf-admin/src/page/waitPakin/SelectSiteModel.jsx |   38 ++++++++++++++++++++++++--------------
 1 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx b/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx
index 26ed4ed..3c828af 100644
--- a/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx
+++ b/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx
@@ -19,6 +19,27 @@
     },
 }));
 
+const SelectSiteButton = (props) => {
+    const { source, setOpen, refresh, notify } = props;
+    const record = useRecordContext();
+    
+    const handleClick = async () => {
+        setOpen(false);
+        const id = record.id;
+        const res = await request.post(`/waitPakin/merge`, {waitPakins: source, siteId: id});
+        if (res?.data?.code === 200) {
+            refresh();
+            notify(res.data.msg);
+        } else {
+            notify(res.data.msg);
+        }
+    };
+    
+    return (
+        <Button label="toolbar.selectSite" onClick={handleClick} />
+    );
+};
+
 const SelectSiteModel = (props) => {
     const { open, setOpen, source } = props;
     const translate = useTranslate();
@@ -47,6 +68,7 @@
                 <DialogContent>
                     <List
                         resource='deviceSite'
+                        filter={{type : 1}}
                         sx={{
                             flexGrow: 1,
                             transition: (theme) =>
@@ -68,17 +90,7 @@
                         <StyledDatagrid
                             preferenceKey='deviceSite'
                             bulkActionButtons={false}
-                            rowClick='toggleSelection'
-                            onToggleItem={async (id)=>{
-                                setOpen(false);
-                                const res = await request.post(`/waitPakin/merge`, {waitPakins: source, siteId: id});
-                                if (res?.data?.code === 200) {
-                                    refresh();
-                                    notify(res.data.msg);
-                                } else {
-                                    notify(res.data.msg);
-                                }
-                            }}
+                            rowClick={false}                            
                             omit={['id','name', 'createTime','label', 'createBy', 'memo', 'updateBy$', 'createBy$', 'createTime', 'updateTime']}
                         >
                             <NumberField source="id" />
@@ -97,9 +109,7 @@
                             <BooleanField source="statusBool" label="common.field.status" sortable={false} />
                             <TextField source="memo" label="common.field.memo" sortable={false} />
                             <WrapperField cellClassName="opt" label="common.field.opt">
-                                <Button label="toolbar.selectSite" onClick={(event)=>{ 
-                                    setOpen(false)
-                                 }}/>
+                            <SelectSiteButton source={source} setOpen={setOpen} refresh={refresh} notify={notify} />
                             </WrapperField>
                         </StyledDatagrid>
                     </List>

--
Gitblit v1.9.1