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/AsnOrderItemList.jsx |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index cedaad8..71ff6c4 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -40,10 +40,9 @@
 import { Box, Typography, Card, Stack, Dialog, DialogActions, DialogTitle, LinearProgress } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import AsnOrderItemCreate from "./AsnOrderItemCreate";
-import EmptyData from "../../components/EmptyData";
-import MyCreateButton from "../../components/MyCreateButton";
-import MyExportButton from '../../components/MyExportButton';
 import PageDrawer from "../../components/PageDrawer";
+import DialogCloseButton from "../../components/DialogCloseButton";
+
 import request from '@/utils/request';
 import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, DEFAULT_ITEM_PAGE_SIZE } from '@/config/setting';
 import AsnOrderItemEdit from "./AsnOrderItemEdit";
@@ -119,7 +118,7 @@
           }}
           title={"menu.asnOrderItem"}
           empty={false}
-          filter={{ asnId: asnId, deleted: 0 }}
+          filter={{ asnId: asnId}}
           filters={filters}
           sort={{ field: "create_time", order: "desc" }}
           actions={(

--
Gitblit v1.9.1