From 81d1ba78214efeeb578e2910be9c319e170a4764 Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Tue, 14 Mar 2023 15:12:12 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=89=8B=E5=8A=A8=E6=8B=86?=
 =?UTF-8?q?=E5=88=86=E6=9C=80=E5=90=8E=E4=B8=80=E5=8D=B7=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MaterialTraceabilityUI/MainWindow.xaml.cs | 17 ++++++++---------
 MaterialTraceabilityUI/SplitSfc.xaml      |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/MaterialTraceabilityUI/MainWindow.xaml.cs b/MaterialTraceabilityUI/MainWindow.xaml.cs
index 995e82e..cffc11d 100644
--- a/MaterialTraceabilityUI/MainWindow.xaml.cs
+++ b/MaterialTraceabilityUI/MainWindow.xaml.cs
@@ -273,15 +273,14 @@ namespace MaterialTraceabilityUI
         /// <param name="e"></param>
         private void ConfigPage_Click(object sender, RoutedEventArgs e)
         {
-            //if (!"2".Equals(ConfigHelper.GetConfig("roleId")))
-            //{
-            //    System.Windows.MessageBox.Show("请登录系统管理账号进行操作");
-            //}
-            //else
-            //{
-            //    UserContent = configInfo;
-            //}
-            UserContent = configInfo;
+            if (!"2".Equals(ConfigHelper.GetConfig("roleId")))
+            {
+                System.Windows.MessageBox.Show("请登录系统管理账号进行操作");
+            }
+            else
+            {
+                UserContent = configInfo;
+            }
         }
 
         public System.Windows.Controls.UserControl _content;
diff --git a/MaterialTraceabilityUI/SplitSfc.xaml b/MaterialTraceabilityUI/SplitSfc.xaml
index a8f2be0..1713f1f 100644
--- a/MaterialTraceabilityUI/SplitSfc.xaml
+++ b/MaterialTraceabilityUI/SplitSfc.xaml
@@ -113,8 +113,8 @@
         <Label Content="CCD打标数：" x:Name="ccdLable" Height="35" FontSize="18" Foreground="#007DFA" Width="120" VerticalAlignment="Center"  HorizontalAlignment="Left" RenderTransformOrigin="1.347,-4.605" Margin="41,340,0,75" Visibility="Hidden"/>
         <TextBox Height="26" FontSize="18" x:Name="ccdTextBox" HorizontalAlignment="Left" VerticalAlignment="Center" Width="120" Margin="178,344,0,80" Visibility="Hidden"/>
 
-        <Label Content="是否最后一卷:" x:Name="endFlagLabel" Margin="573,268,0,146"  Height="36" FontSize="18" Foreground="#007DFA" Width="130" VerticalAlignment="Center"  HorizontalAlignment="Left" Visibility="Hidden"/>
-        <ComboBox x:Name="endFlagCombox" Width="88" Foreground="#007DFA" HorizontalAlignment="Left" VerticalAlignment="Center" Height="30" Margin="706,270,0,150" Visibility="Hidden">
+        <Label Content="是否最后一卷:" x:Name="endFlagLabel" Margin="573,268,0,146"  Height="36" FontSize="18" Foreground="#007DFA" Width="130" VerticalAlignment="Center"  HorizontalAlignment="Left"/>
+        <ComboBox x:Name="endFlagCombox" Width="88" Foreground="#007DFA" HorizontalAlignment="Left" VerticalAlignment="Center" Height="30" Margin="706,270,0,150" >
             <ComboBoxItem Content="否"/>
             <ComboBoxItem Content="是"/>
         </ComboBox>