From e80184f5d053bff9d0f7fdaade6c800bee84c7dd Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 四月 2025 12:49:57 +0800
Subject: [PATCH] #修改 1. 新增综合订单管理 2. 新增综合明细订单管理

---
 rsf-admin/src/page/waitPakin/SelectSiteModel.jsx |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx b/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx
index 9dca697..26ed4ed 100644
--- a/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx
+++ b/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx
@@ -1,10 +1,10 @@
 import { Dialog, DialogTitle, Box, DialogActions, DialogContent } from "@mui/material";
 import React, { useState, useRef, useEffect, useMemo, useCallback, Form } from "react";
 import { styled } from '@mui/material/styles';
-import { FilterButton, TopToolbar, Toolbar, useTranslate, SaveButton, List, SelectInput, NumberField, WrapperField, EditButton, DeleteButton, TextField, DateField, TextInput, BooleanField, NumberInput, ReferenceField, SearchInput, SelectColumnsButton, DatagridConfigurable, Button, useRefresh } from "react-admin";
+import { FilterButton, TopToolbar, Toolbar, useTranslate, SaveButton, List, useRecordSelection, SelectInput, NumberField, WrapperField, EditButton, DeleteButton, TextField, DateField, TextInput, BooleanField, NumberInput, ReferenceField, SearchInput, SelectColumnsButton, DatagridConfigurable, Button, useRefresh, useRecordContext, useNotify } from "react-admin";
 import DialogCloseButton from "../components/DialogCloseButton";
 import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_ITEM_PAGE_SIZE } from '@/config/setting';
-
+import request from '@/utils/request';
 const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
     '& .css-1vooibu-MuiSvgIcon-root': {
         height: '.9em'
@@ -20,19 +20,21 @@
 }));
 
 const SelectSiteModel = (props) => {
-    const { open, setOpen, record } = props;
+    const { open, setOpen, source } = props;
     const translate = useTranslate();
     const [drawerVal, setDrawerVal] = useState(false);
     const refresh = useRefresh();
+    const notify = useNotify();
     const handleClose = (event, reason) => {
         if (reason !== "backdropClick") {
             setOpen(false);
         }
     };
-
+    console.log(source);
     return (
         <Box>
             <Dialog
+            sx={{width: '90%'}}
                 open={open}
                 onClose={handleClose}
                 fullWidth
@@ -67,12 +69,17 @@
                             preferenceKey='deviceSite'
                             bulkActionButtons={false}
                             rowClick='toggleSelection'
-                            onToggleItem={(id, resource, record)=>{
-                                console.log(id);
+                            onToggleItem={async (id)=>{
                                 setOpen(false);
-                                refresh();
+                                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);
+                                }
                             }}
-                            omit={['id', 'createTime', 'createBy', 'memo', 'updateBy$', 'createBy$', 'createTime', 'updateTime']}
+                            omit={['id','name', 'createTime','label', 'createBy', 'memo', 'updateBy$', 'createBy$', 'createTime', 'updateTime']}
                         >
                             <NumberField source="id" />
                             <TextField source="name" label="table.field.deviceSite.name" />
@@ -89,11 +96,9 @@
                             <DateField source="createTime" label="common.field.createTime" showTime />
                             <BooleanField source="statusBool" label="common.field.status" sortable={false} />
                             <TextField source="memo" label="common.field.memo" sortable={false} />
-                            <WrapperField>
-                                <Button label="toolbar.selectSite" onClick={(id, resource, record)=>{ 
-                                    console.log(id);
+                            <WrapperField cellClassName="opt" label="common.field.opt">
+                                <Button label="toolbar.selectSite" onClick={(event)=>{ 
                                     setOpen(false)
-                                    refresh();
                                  }}/>
                             </WrapperField>
                         </StyledDatagrid>

--
Gitblit v1.9.1