From 9fc7622352e2c84dacd90dfce103eb8ff1128678 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 09 四月 2025 14:07:47 +0800
Subject: [PATCH] 任务列表界面优化

---
 rsf-admin/src/page/asnOrder/AsnOrderModal.jsx |   67 +++++++++++++++++++++++++++------
 1 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
index 3f6b568..a6d4d10 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
@@ -51,8 +51,8 @@
 import SaveIcon from '@mui/icons-material/Save';
 import request from '@/utils/request';
 import { Add, Edit, Delete } from '@mui/icons-material';
-import _ from 'lodash';
-import { DataGrid } from '@mui/x-data-grid';
+import _, { set } from 'lodash';
+import { DataGrid, useGridApiRef } from '@mui/x-data-grid';
 import DictionarySelect from "../components/DictionarySelect";
 import DictSelect from "../components/DictSelect";
 
@@ -66,11 +66,14 @@
 
     const [createDialog, setCreateDialog] = useState(false);
 
+    const tableRef = useRef();
+
     useEffect(() => {
         if (open && asnId !== 0) {
             requestGetHead()
             requestGetBody()
         }
+        setDisabled(false)
     }, [open])
 
     const handleClose = (event, reason) => {
@@ -97,8 +100,30 @@
         }));
     };
 
+    const resetData = () => {
+        setFormData({
+            type: '',
+            wkType: '',
+        })
+        setTableData([])
+    }
+
+    const setFinally = () => {
+        const rows = tableRef.current.state.editRows;
+        for (const key in rows) {
+            const find = tabelData.find(item => item.matnrId === +key);
+            find.anfme = rows[key].anfme.value;
+        }
+        setTableData([...tabelData]);
+
+    }
+
+
+
     const handleSubmit = async () => {
+        setFinally()
         setDisabled(true)
+
         if (asnId === 0) {
             const parmas = {
                 "orders": formData,
@@ -108,8 +133,9 @@
             const res = await request.post(`/asnOrder/items/save`, parmas);
             if (res?.data?.code === 200) {
                 setOpen(false);
-                billReload()
                 refresh();
+                billReload?.current()
+                resetData()
             } else {
                 notify(res.data.msg);
             }
@@ -122,7 +148,8 @@
             if (res?.data?.code === 200) {
                 setOpen(false);
                 refresh();
-
+                billReload?.current()
+                resetData()
             } else {
                 notify(res.data.msg);
             }
@@ -162,6 +189,8 @@
 
     const [selectedRows, setSelectedRows] = useState([]);
 
+
+
     const handleDeleteItem = () => {
         const newTableData = _.filter(tabelData, (item) => !selectedRows.includes(item.matnrId));
         setTableData(newTableData);
@@ -176,7 +205,7 @@
                 aria-hidden
                 fullWidth
                 disableRestoreFocus
-                maxWidth="md"   // 'xs' | 'sm' | 'md' | 'lg' | 'xl'
+                maxWidth="lg"   // 'xs' | 'sm' | 'md' | 'lg' | 'xl'
             >
                 <DialogTitle id="form-dialog-title" sx={{
                     position: 'sticky',
@@ -228,7 +257,7 @@
                     </Box>
 
                     <Box sx={{ mt: 2 }}>
-                        <AsnOrderModalTable tabelData={tabelData} setTableData={setTableData} asnId={asnId} selectedRows={selectedRows} setSelectedRows={setSelectedRows} ></AsnOrderModalTable>
+                        <AsnOrderModalTable tabelData={tabelData} setTableData={setTableData} asnId={asnId} selectedRows={selectedRows} setSelectedRows={setSelectedRows} tableRef={tableRef}></AsnOrderModalTable>
                     </Box>
                 </DialogContent>
                 <DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
@@ -253,7 +282,7 @@
 
 export default AsnOrderModal;
 
-const AsnOrderModalTable = ({ tabelData, setTableData, asnId, selectedRows, setSelectedRows }) => {
+const AsnOrderModalTable = ({ tabelData, setTableData, asnId, selectedRows, setSelectedRows, tableRef }) => {
     const translate = useTranslate();
     const notify = useNotify();
 
@@ -274,9 +303,11 @@
         {
             field: 'anfme',
             headerName: translate('table.field.asnOrderItem.purQty'),
+            type: 'number',
             minWidth: 100,
             flex: 1,
             editable: true,
+            valueFormatter: (val) => val < 0 ? 0 : val
         },
         {
             field: 'splrCode',
@@ -392,11 +423,16 @@
 
 
     const processRowUpdate = (newRow, oldRow) => {
-        setTableData((prevData) =>
-            prevData.map((r) =>
-                r.matnrId === newRow.matnrId ? { ...newRow } : r
-            )
-        );
+        const rows = tabelData.map((r) =>
+            r.matnrId === newRow.matnrId ? { ...newRow } : r
+        )
+        setTableData(rows)
+        // setTableData((prevData) =>
+        //     prevData.map((r) =>
+        //         r.matnrId === newRow.matnrId ? { ...newRow } : r
+        //     )
+
+        // );
 
         return newRow;
     };
@@ -408,9 +444,13 @@
 
     };
 
+    tableRef.current = useGridApiRef();
+
+
     return (
         <div style={{ height: 400, width: '100%' }}>
             <DataGrid
+                apiRef={tableRef}
                 rows={tabelData}
                 columns={columns}
                 disableRowSelectionOnClick
@@ -420,7 +460,8 @@
                 disableColumnSorting
                 disableMultipleColumnsSorting
                 processRowUpdate={processRowUpdate}
-                autoPageSize
+                pageSizeOptions={[25, 50, 100]}
+                paginationModel={{ pageSize: 50, page: 0 }}
                 editMode="row"
                 checkboxSelection
                 onRowSelectionModelChange={handleSelectionChange}

--
Gitblit v1.9.1