change - 手动拆分最后一卷不显示问题处理

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")))
+            if (!"2".Equals(ConfigHelper.GetConfig("roleId")))
-            //{
+            {
-            //    System.Windows.MessageBox.Show("请登录系统管理账号进行操作");
+                System.Windows.MessageBox.Show("请登录系统管理账号进行操作");
-            //}
+            }
-            //else
+            else
-            //{
+            {
-            //    UserContent = configInfo;
+                UserContent = configInfo;
-            //}
+            }
-            UserContent = configInfo;
         }
 
         public System.Windows.Controls.UserControl _content;

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"/>
+        <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" Visibility="Hidden">
+        <ComboBox x:Name="endFlagCombox" Width="88" Foreground="#007DFA" HorizontalAlignment="Left" VerticalAlignment="Center" Height="30" Margin="706,270,0,150" >
             <ComboBoxItem Content="否"/>
             <ComboBoxItem Content="是"/>
         </ComboBox>