From 8e622d6a1d07937cd654364748b52e15a50c67d8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 14 五月 2025 09:14:43 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx |   83 +++++++++++++++++++++++++++++++++--------
 1 files changed, 66 insertions(+), 17 deletions(-)

diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
index 0627434..4a6bec8 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
@@ -56,7 +56,10 @@
 import DictionarySelect from "../../components/DictionarySelect";
 import ExitToAppIcon from '@mui/icons-material/ExitToApp';
 import ImportButton from "../../components/ImportButton";
-
+import PrintOutlinedIcon from '@mui/icons-material/PrintOutlined';
+import OrderPrintPreview from "./OrderPrintPreview";
+import CreateNewFolderOutlinedIcon from '@mui/icons-material/CreateNewFolderOutlined';
+import AsnCreateByPoModal from "./AsnCreateByPoModal";
 const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
   '& .css-1vooibu-MuiSvgIcon-root': {
     height: '.9em'
@@ -112,7 +115,10 @@
   const [createDialog, setCreateDialog] = useState(false);
   const [drawerVal, setDrawerVal] = useState(false);
   const [modalType, setmodalType] = useState(0);
-  const [select, setSelect] = useState(0);
+  const [poCreate, setPoCreate] = useState(false);
+  const [printOrder, setPrintOrder] = useState(false);
+  const [select, setSelect] = useState({});
+  const invoiceRef = useRef();
   const billReload = useRef();
   const notify = useNotify();
   const refresh = useRefresh();
@@ -132,12 +138,12 @@
         title={"menu.asnOrder"}
         empty={false}
         filters={filters}
-        filter={{ deleted: 0 }}
         sort={{ field: "create_time", order: "desc" }}
         actions={(
           <TopToolbar>
             <FilterButton />
             <MyCreateButton onClick={() => { setCreateDialog(true); setmodalType(0) }} />
+            <CreateByPoButton setPoCreate={setPoCreate}/>
             <SelectColumnsButton preferenceKey='asnOrder' />
             <ImportButton value={'asnOrderItem'} />
             <MyExportButton />
@@ -183,7 +189,8 @@
             <MyButton setCreateDialog={setCreateDialog} setmodalType={setmodalType} />
             <InspectionButton />
             <CompleteButton />
-            <ODeleteButton  />
+            <ODeleteButton />
+            <PrintButton setPrintOrder={setPrintOrder} setSelect={setSelect} />
             {/* <CloseButton /> */}
           </WrapperField>
         </StyledDatagrid>
@@ -193,6 +200,15 @@
         setOpen={setCreateDialog}
         asnId={modalType}
         billReload={billReload}
+      />
+      <OrderPrintPreview
+        open={printOrder}
+        setOpen={setPrintOrder}
+        record={select}
+      />
+      <AsnCreateByPoModal
+        open={poCreate}
+        setOpen={setPoCreate}
       />
       <PageDrawer
         title='AsnOrder Detail'
@@ -205,10 +221,43 @@
 }
 export default AsnOrderList;
 
+//鎸塒O鍗曟柊寤�
+const CreateByPoButton = ({setPoCreate}) => {
+  const record = useRecordContext();
+
+  const createEvent = (event) => {
+    event.stopPropagation();
+    setPoCreate(true)
+  }
+  return (
+    <Button label={"toolbar.poCreate"} onClick={createEvent}>
+      <CreateNewFolderOutlinedIcon />
+    </Button>
+  )
+}
+
+
+//鎵撳嵃鎸夐挳
+const PrintButton = ({ setPrintOrder, setSelect }) => {
+  const record = useRecordContext();
+  const printOrder = (event) => {
+    event.stopPropagation();
+    setPrintOrder(true)
+    setSelect(record)
+  }
+
+  return (
+    <Button label={"toolbar.print"} onClick={printOrder}>
+      <PrintOutlinedIcon />
+    </Button>
+  )
+}
+
+
 const ODeleteButton = () => {
   const record = useRecordContext();
   return (
-    record.exceStatus === 0 ? <DeleteButton  mutationMode="pessimistic"/> : <></>
+    record.exceStatus === 0 ? <DeleteButton mutationMode="pessimistic" /> : <></>
   )
 
 }
@@ -224,15 +273,15 @@
   };
   return (
     record.exceStatus === 1 || record.exceStatus === 0 ?
-    <Button
-      color="primary"
-      startIcon={<EditIcon />}
-      onClick={(btn) => handleEditClick(btn)}
-      sx={{ ml: 1 }}
-      label={'ra.action.edit'}
-    >
-    </Button>
-    : <></>
+      <Button
+        color="primary"
+        startIcon={<EditIcon />}
+        onClick={(btn) => handleEditClick(btn)}
+        sx={{ ml: 1 }}
+        label={'ra.action.edit'}
+      >
+      </Button>
+      : <></>
   )
 }
 
@@ -257,7 +306,7 @@
   }
 
   return (
-      <ConfirmButton label={"toolbar.inspection"} color="secondary" startIcon={<ConstructionIcon />} onConfirm={inspection} />
+    <ConfirmButton label={"toolbar.inspection"} color="secondary" startIcon={<ConstructionIcon />} onConfirm={inspection} />
   )
 }
 
@@ -361,7 +410,7 @@
     // record.exceStatus === 1 && (record.anfme === record.qty ? <Button onClick={requestComplete} label={"toolbar.complete"} color="secondary">
     //   <TaskIcon />
     // </Button> : )
-    record.exceStatus === 1 ? <ConfirmButton label={"toolbar.complete"} color="secondary"  startIcon={<TaskIcon />} onConfirm={requestComplete} /> : <></>
+    record.exceStatus === 1 ? <ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskIcon />} onConfirm={requestComplete} /> : <></>
   )
 
 
@@ -383,6 +432,6 @@
   }
 
   return (
-    <ConfirmButton label={"toolbar.close"} color="error"  startIcon={<CloseIcon />} onConfirm={requestClose} />
+    <ConfirmButton label={"toolbar.close"} color="error" startIcon={<CloseIcon />} onConfirm={requestClose} />
   )
 }

--
Gitblit v1.9.1