From c90cfc885fc256dd2faf69c7fef0cad3173c7a8e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 七月 2025 09:48:46 +0800
Subject: [PATCH] 调拔单功能优化

---
 rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx |   60 ++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
index ea3aae5..fbe9491 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
@@ -1,5 +1,4 @@
 import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
-import { useLocation, useNavigate } from 'react-router-dom';
 import {
   List,
   DatagridConfigurable,
@@ -37,29 +36,30 @@
   useRedirect,
   useUnselectAll,
 } from 'react-admin';
-import { Box, Typography, Card, Stack } from '@mui/material';
-import { styled } from '@mui/material/styles';
-import AsnOrderModal from "./AsnOrderModal";
-import AsnOrderPanel from "./AsnOrderPanel";
-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 ConstructionIcon from "@mui/icons-material/Construction";
-import EditIcon from '@mui/icons-material/Edit';
-import TaskIcon from '@mui/icons-material/Task';
-import CloseIcon from '@mui/icons-material/Close';
-import request from '@/utils/request';
+import CreateNewFolderOutlinedIcon from '@mui/icons-material/CreateNewFolderOutlined';
+import PrintOutlinedIcon from '@mui/icons-material/PrintOutlined';
 import DictionarySelect from "../../components/DictionarySelect";
+import ConstructionIcon from "@mui/icons-material/Construction";
+import BillStatusField from '../../components/BillStatusField';
+import { Box, Typography, Card, Stack } from '@mui/material';
+import MyCreateButton from "../../components/MyCreateButton";
+import { useLocation, useNavigate } from 'react-router-dom';
+import MyExportButton from '../../components/MyExportButton';
+import ConfirmButton from '../../components/ConfirmButton';
 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";
+import PageDrawer from "../../components/PageDrawer";
+import OrderPrintPreview from "./OrderPrintPreview";
+import CloseIcon from '@mui/icons-material/Close';
+import EditIcon from '@mui/icons-material/Edit';
+import TaskIcon from '@mui/icons-material/Task';
+import { styled } from '@mui/material/styles';
+import AsnOrderModal from "./AsnOrderModal";
+import request from '@/utils/request';
+
 const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
   '& .css-1vooibu-MuiSvgIcon-root': {
     height: '.9em'
@@ -69,14 +69,21 @@
   },
   '& .column-name': {
   },
-  '& .opt': {
-    width: 220
-  },
+
   '& .wkType': {
     width: 110
   },
   '& .status': {
     width: 90
+  },
+  '& .MuiTableCell-root': {
+    whiteSpace: 'nowrap',
+    overflow: 'visible',
+    textOverflow: 'unset'
+  },
+  '& .opt': {
+    width: 220,
+
   },
 }));
 
@@ -163,7 +170,7 @@
             </>}
           rowClick={false}
           expandSingle={true}
-          omit={['id', 'createTime', 'createBy', 'memo', 'logisNo', 'poId', 'rleStatus$']}
+          omit={['id', 'createTime', 'createBy', 'memo', 'logisNo', 'poId', 'rleStatus$', 'createBy$']}
         >
           <NumberField source="id" />
           <TextField source="code" label="table.field.asnOrder.code" />
@@ -344,15 +351,16 @@
 
 const BtnBulkExport = () => {
   const { filter, selectedIds, filterValues, resource, sort, total } = useListContext();
-  const refresh = useRefresh();
-  const dataProvider = useDataProvider();
-  const notify = useNotify();
   const unSelect = useUnselectAll(resource);
+  const dataProvider = useDataProvider();
+  const refresh = useRefresh();
+  const notify = useNotify();
 
   const bulkExport = () => {
     getExport()
     unSelect();
   }
+
   const getExport = () => {
     dataProvider
       .export(resource, {

--
Gitblit v1.9.1