From ff7339e37dcdf04d81652ce20d4b1997e4b1f7c1 Mon Sep 17 00:00:00 2001
From: hehaibing-1996 <hehaibing1996@qq.com>
Date: Sat, 11 Jan 2025 11:25:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/MatBaseInfoViewModel.cs        |  1 -
 .../Views/MatBaseInfoAddOrUpdateView.xaml.cs  |  1 -
 货架标准上位机/Views/MatBaseInfoView.xaml     | 31 +++----------------
 3 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/货架标准上位机/ViewModels/MatBaseInfoViewModel.cs b/货架标准上位机/ViewModels/MatBaseInfoViewModel.cs
index f23c1cb..586bf89 100644
--- a/货架标准上位机/ViewModels/MatBaseInfoViewModel.cs
+++ b/货架标准上位机/ViewModels/MatBaseInfoViewModel.cs
@@ -149,7 +149,6 @@ namespace 智慧物流软件系统.ViewModel
                 if (Result != null && Result.Data != null && Result.Data.Lists != null)
                 {
                     DataGridItemSource = new ObservableCollection<MatBaseInfoModel>(Result.Data.Lists);
-                    //DataGridItemSource = Result.Data.Lists;
                     MaxPage = Result.Data.MaxPage;
                     TotalCount = Result.Data.TotalCount;
                 }
diff --git a/货架标准上位机/Views/MatBaseInfoAddOrUpdateView.xaml.cs b/货架标准上位机/Views/MatBaseInfoAddOrUpdateView.xaml.cs
index 86376d5..0ddc49e 100644
--- a/货架标准上位机/Views/MatBaseInfoAddOrUpdateView.xaml.cs
+++ b/货架标准上位机/Views/MatBaseInfoAddOrUpdateView.xaml.cs
@@ -37,7 +37,6 @@ namespace 智慧物流软件系统
                 matBaseInfo = new MatBaseInfoModel();
                 ViewModel.IsEnable = true;
             }
-                
 
             //绑定标题
             if (!string.IsNullOrEmpty(_titleText))
diff --git a/货架标准上位机/Views/MatBaseInfoView.xaml b/货架标准上位机/Views/MatBaseInfoView.xaml
index 290972d..af32e5e 100644
--- a/货架标准上位机/Views/MatBaseInfoView.xaml
+++ b/货架标准上位机/Views/MatBaseInfoView.xaml
@@ -95,21 +95,16 @@
 
                         <Button MinHeight="40" FontSize="18" Margin="5"
                                 Content="&#xe612;修  改" FontFamily="{StaticResource IconFont}"
-                                   Foreground="WhiteSmoke"
+                                Foreground="WhiteSmoke"
                                 Background="CadetBlue"
-                                Command="{Binding BtnEditCommand}"
-                               
-                                >
+                                Command="{Binding BtnEditCommand}">
                         </Button>
 
-
                         <Button MinHeight="40" FontSize="18" Margin="5"
                                 Content="&#xe8c1;删  除" FontFamily="{StaticResource IconFont}"
-                                   Foreground="WhiteSmoke"
+                                Foreground="WhiteSmoke"
                                 Command="{Binding BtnDeleteCommand}"
-                                Style="{StaticResource ButtonDanger}"
-                             
-                                >
+                                Style="{StaticResource ButtonDanger}">
                         </Button>
 
                         <Button MinHeight="40" FontSize="18" Margin="5"
@@ -119,29 +114,13 @@
                                 Background="Green"
                                 >
                         </Button>
+
                         <Button MinHeight="40" FontSize="18" Margin="5"
                                 Content="&#xe866;导  出" FontFamily="{StaticResource IconFont}"
                                 Command="{Binding BtnExportCommand}"
-                                   Foreground="WhiteSmoke"
-                                Background="DarkOrange"
-                                >
-                        </Button>
-
-                        
-                        <Button MinHeight="40" FontSize="18" Margin="5"
-                                Content="&#xe7f8;生成&amp;打印" FontFamily="{StaticResource IconFont}"
-                                Command="{Binding BtnPrintCommand}"
                                 Foreground="WhiteSmoke"
                                 Background="DarkOrange">
                         </Button>
-                        
-                        <Button MinHeight="40" FontSize="18" Margin="5"
-                                Content="&#xe7f8;扫描生成打印" FontFamily="{StaticResource IconFont}"
-                                Command="{Binding BtnScanPrintCommand}"
-                                Foreground="WhiteSmoke"
-                                Background="BlueViolet">
-                        </Button>
-                        
                     </StackPanel>
 
                     <DataGrid Grid.Row="1"