From 38738b94b499ba1ccd37ab8824b5569db6662d5f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 07 六月 2025 13:04:13 +0800
Subject: [PATCH] 波次策略功能完善

---
 rsf-admin/src/page/orders/outStock/OutOrderList.jsx |   44 +++++++++++++++++++++++++++++---------------
 1 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index 979c23f..e9906a6 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -37,14 +37,11 @@
   useRedirect,
   useUnselectAll,
 } from 'react-admin';
-import { Box, Typography, Card, Stack } from '@mui/material';
+import { Box, Typography, Card, Stack, Drawer } from '@mui/material';
 import { styled } from '@mui/material/styles';
-import EmptyData from "../../components/EmptyData";
 import MyCreateButton from "../../components/MyCreateButton";
-import MyExportButton from '../../components/MyExportButton';
 import BillStatusField from '../../components/BillStatusField';
 import ConfirmButton from '../../components/ConfirmButton';
-import PageDrawer from "../../components/PageDrawer";
 import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
 import EditIcon from '@mui/icons-material/Edit';
 import request from '@/utils/request';
@@ -52,11 +49,13 @@
 import ImportButton from "../../components/ImportButton";
 import DetailsIcon from '@mui/icons-material/Details';
 import CancelOutlinedIcon from '@mui/icons-material/CancelOutlined';
-import OutOrderCreate from "./OutOrderCreate";
 import AddIcon from '@mui/icons-material/Add';
 import OutOrderModal from "./OutOrderModal";
 import PublicIcon from '@mui/icons-material/Public';
 import SelectMatnrModal from "./SelectMatnrModal";
+import AddTaskIcon from '@mui/icons-material/AddTask';
+import PageEditDrawer from "../../components/PageEditDrawer";
+import OutStockPublic from "./OutStockPublic";
 
 const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
   '& .css-1vooibu-MuiSvgIcon-root': {
@@ -129,7 +128,6 @@
             theme.transitions.create(['all'], {
               duration: theme.transitions.duration.enteringScreen,
             }),
-          marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
         }}
         title={"menu.outStock"}
         empty={false}
@@ -142,7 +140,7 @@
             <CreateByOrderButton setCreateDialog={setCreateDialog} />
             <MyCreateButton onClick={() => { setManualDialog(true); setmodalType(0) }} />
             <SelectColumnsButton preferenceKey='outStock' />
-            <ImportButton value={'asnOrderItem'} />
+            <ImportButton value={'outStock'} />
             {/* <MyExportButton /> */}
           </TopToolbar>
         )}
@@ -151,16 +149,14 @@
         <StyledDatagrid
           sx={{ width: '100%' }}
           preferenceKey='outStock'
-          bulkActionButtons={
-            <PublicTaskButton />}
+          bulkActionButtons={<PublicTaskButton />}
           rowClick={false}
           expandSingle={true}
-          omit={['id', 'createTime', 'createBy', 'memo', 'poId', 'rleStatus$']}
+          omit={['id', 'createTime', 'createBy', 'memo', 'rleStatus$']}
         >
           <NumberField source="id" />
           <TextField source="code" label="table.field.outStock.code" />
           <TextField source="poCode" label="table.field.outStock.poCode" />
-          <NumberField source="poId" label="table.field.outStock.poId" />
           <TextField source="type$" label="table.field.outStock.type" />
           <TextField cellClassName="wkType" source="wkType$" label="table.field.outStock.wkType" />
           <NumberField source="anfme" label="table.field.outStock.anfme" />
@@ -178,6 +174,7 @@
             <MyButton setCreateDialog={setManualDialog} setmodalType={setmodalType} />
             <EditButton label="toolbar.detail" icon={(<DetailsIcon />)}></EditButton>
             <CancelButton />
+            <PublicButton setDrawerVal={setDrawerVal} drawerVal={drawerVal} setSelect={setSelect} />
           </WrapperField>
         </StyledDatagrid>
       </List>
@@ -195,11 +192,13 @@
         open={createDialog}
         setOpen={setCreateDialog}
       />
-      <PageDrawer
-        title='AsnOrder Detail'
+      <PageEditDrawer
+        title={"toolbar.publicWorking"}
         drawerVal={drawerVal}
         setDrawerVal={setDrawerVal}
-      />
+      >
+        <OutStockPublic record={select} />
+      </PageEditDrawer>
     </Box >
   )
 }
@@ -284,6 +283,21 @@
   }
 
   return (
-    record?.exceStatus == 10 ? <ConfirmButton label={"toolbar.cancel"} startIcon={<CancelOutlinedIcon />} onConfirm={cancelOrder} /> : <></>
+    record?.exceStatus == 10 ? <ConfirmButton label={"toolbar.cancel"} startIcon={<CancelOutlinedIcon />} onConfirm={cancelOrder} size={"small"} /> : <></>
+  )
+}
+
+//涓嬪彂鎵ц
+const PublicButton = ({ setDrawerVal, setSelect }) => {
+  const record = useRecordContext();
+  const refresh = useRefresh();
+  const taskEvent = () => {
+    setDrawerVal(true)
+    setSelect(record)
+    refresh();
+  }
+
+  return (
+    <ConfirmButton label={"toolbar.publicWorking"} startIcon={<AddTaskIcon />} onConfirm={taskEvent} size={"small"} />
   )
 }

--
Gitblit v1.9.1