界面及图标优化

UniformMaterialManagementSystem/Views/ContractPage.xaml

@@ -151,7 +151,7 @@
         </Style>
 
     </UserControl.Resources>
-    <Grid>
+    <Grid Background="White">
         <TabControl FlowDirection="LeftToRight">
             <TabItem Header="合同录入">
                 <Grid Background="White">
@@ -161,10 +161,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="*" />
                     </Grid.RowDefinitions>
-                    <Border
-                        Grid.Row="0"
-                        BorderBrush="Gray"
-                        BorderThickness="1">
+                    <Border Grid.Row="0">
                         <Grid>
                             <ToolBarPanel>
                                 <ToolBar Background="White" ToolBarTray.IsLocked="True">
@@ -1102,10 +1099,7 @@
                         <RowDefinition Height="*" />
                     </Grid.RowDefinitions>
                     <!--  菜单项  -->
-                    <Border
-                        Grid.Row="0"
-                        BorderBrush="Gray"
-                        BorderThickness="1">
+                    <Border Grid.Row="0">
                         <Grid Background="White">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="80" />
@@ -1355,7 +1349,7 @@
                         Height="2"
                         HorizontalAlignment="Stretch" />
                     <ScrollViewer Grid.Row="3" VerticalScrollBarVisibility="Auto">
-                        <Border BorderBrush="LightSlateGray" BorderThickness="1">
+                        <Border>
                             <Grid Background="White">
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="60" />

UniformMaterialManagementSystem/Views/FactoryLicense/FactoryLicenseInputPage.xaml

@@ -151,7 +151,7 @@
                 <Border
                     Grid.Row="0"
                     BorderBrush="Gray"
-                    BorderThickness="1">
+                    BorderThickness="0,0,1,0">
                     <Grid Background="White">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />

UniformMaterialManagementSystem/Views/FactoryLicense/FactoryLicenseManagePage.xaml

@@ -150,7 +150,7 @@
                 <Border
                     Grid.Row="0"
                     BorderBrush="Gray"
-                    BorderThickness="1">
+                    BorderThickness="0,0,1,0">
                     <Grid Background="White">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />

UniformMaterialManagementSystem/Views/FactoryLicensePage.xaml

@@ -8,7 +8,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
-    <Grid>
+    <Grid Background="White">
         <TabControl>
             <TabItem Header="许可证录入">
                 <license:FactoryLicenseInputPage />

UniformMaterialManagementSystem/Views/InspectApplyAndInspectionRecordPage.xaml

@@ -8,7 +8,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
-    <Grid>
+    <Grid Background="White">
         <TabControl FlowDirection="LeftToRight">
             <TabItem Header="检验申请录入">
                 <local:InspectApplyPage />

UniformMaterialManagementSystem/Views/InspectApplyPage.xaml

@@ -164,7 +164,7 @@
         <Border
             Grid.Row="0"
             BorderBrush="Gray"
-            BorderThickness="1">
+            BorderThickness="0,0,0,1">
             <ToolBarPanel>
                 <ToolBar Background="White" ToolBarTray.IsLocked="True">
                     <Button Click="Button_Click" Command="{Binding SaveInspectApplyCommand}">
@@ -196,10 +196,7 @@
             </ToolBarPanel>
         </Border>
 
-        <Border
-            Grid.Row="1"
-            BorderBrush="Gray"
-            BorderThickness="1">
+        <Border Grid.Row="1">
             <Grid Background="White">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="3*" />
@@ -208,11 +205,7 @@
                 </Grid.ColumnDefinitions>
                 <!--  左侧  -->
                 <ScrollViewer Grid.Column="0" VerticalScrollBarVisibility="Auto">
-                    <Border
-                        Grid.Column="0"
-                        Padding="10,10,20,10"
-                        BorderBrush="Gray"
-                        BorderThickness="1">
+                    <Border Padding="10,10,20,10">
                         <Grid Background="White">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
@@ -830,16 +823,18 @@
                 <GridSplitter
                     Grid.Column="1"
                     Width="2"
-                    HorizontalAlignment="Stretch" />
+                    HorizontalAlignment="Stretch"
+                    BorderBrush="LightSlateGray"
+                    BorderThickness="0,0,1,0" />
                 <!--  右侧  -->
                 <Border
                     Grid.Column="2"
                     Padding="10,10,10,10"
                     BorderBrush="Gray"
-                    BorderThickness="1">
+                    BorderThickness="0,0,0,0">
                     <Grid Background="White">
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="50" />
+                            <RowDefinition Height="35" />
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
                         <TextBlock
@@ -856,7 +851,7 @@
                             <Border
                                 Grid.Row="0"
                                 BorderBrush="Gray"
-                                BorderThickness="1">
+                                BorderThickness="1,1,1,0">
                                 <ToolBarPanel>
                                     <ToolBar Background="White" ToolBarTray.IsLocked="True">
                                         <Button

UniformMaterialManagementSystem/Views/InspectionRecordPage.xaml

@@ -170,7 +170,7 @@
                 <Border
                     Grid.Row="0"
                     BorderBrush="Gray"
-                    BorderThickness="1">
+                    BorderThickness="0,0,0,0">
                     <Grid Background="White">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
@@ -523,10 +523,9 @@
                         <!--  左侧  -->
                         <ScrollViewer Grid.Column="0" VerticalScrollBarVisibility="Auto">
                             <Border
-                                Grid.Column="0"
                                 Padding="10,10,20,10"
                                 BorderBrush="Gray"
-                                BorderThickness="1">
+                                BorderThickness="0">
                                 <Grid Background="White">
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="Auto" />
@@ -839,6 +838,7 @@
                                         Grid.Row="8"
                                         Grid.Column="1"
                                         Grid.ColumnSpan="3"
+                                        Height="185"
                                         Padding="5"
                                         FontSize="14"
                                         IsReadOnly="True"
@@ -941,16 +941,18 @@
             <GridSplitter
                 Grid.Column="1"
                 Width="2"
-                HorizontalAlignment="Stretch" />
+                HorizontalAlignment="Stretch"
+                BorderBrush="LightSlateGray"
+                BorderThickness="0,0,1,0" />
             <Grid Grid.Column="2" Background="White">
                 <!--  右侧  -->
                 <Border
                     Padding="10,10,10,10"
                     BorderBrush="Gray"
-                    BorderThickness="1">
+                    BorderThickness="0">
                     <Grid Background="White">
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="50" />
+                            <RowDefinition Height="35" />
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
                         <TextBlock
@@ -967,7 +969,7 @@
                             <Border
                                 Grid.Row="0"
                                 BorderBrush="Gray"
-                                BorderThickness="1">
+                                BorderThickness="1,1,1,0">
                                 <ToolBarPanel>
                                     <ToolBar Background="White" ToolBarTray.IsLocked="True">
                                         <Button Command="{Binding ExportDetailCommand}">

UniformMaterialManagementSystem/Views/InspectionReport/InspectionReportInputPage.xaml

@@ -154,7 +154,7 @@
                 <Border
                     Grid.Row="0"
                     BorderBrush="Gray"
-                    BorderThickness="1">
+                    BorderThickness="0,0,1,0">
                     <Grid Background="White">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
@@ -697,7 +697,7 @@
                         <Border
                             Grid.Row="0"
                             BorderBrush="Gray"
-                            BorderThickness="1">
+                            BorderThickness="1,1,1,0">
                             <ToolBarPanel>
                                 <ToolBar Background="White" ToolBarTray.IsLocked="True">
                                     <Button HorizontalContentAlignment="Center" Command="{Binding AddInspectionReportDetailCommand}">

UniformMaterialManagementSystem/Views/InspectionReport/InspectionReportManagePage.xaml

@@ -155,7 +155,7 @@
                 <Border
                     Grid.Row="0"
                     BorderBrush="Gray"
-                    BorderThickness="1">
+                    BorderThickness="0,0,1,0">
                     <ToolBarPanel>
                         <ToolBar Background="White" ToolBarTray.IsLocked="True">
                             <Button Command="{Binding LoadDataCommand}">
@@ -759,7 +759,7 @@
                         <Border
                             Grid.Row="0"
                             BorderBrush="Gray"
-                            BorderThickness="1">
+                            BorderThickness="1,1,1,0">
                             <ToolBarPanel>
                                 <ToolBar Background="White" ToolBarTray.IsLocked="True">
                                     <Button

UniformMaterialManagementSystem/Views/SampleRegistration/SampleRegistrationInputPage.xaml

@@ -154,7 +154,7 @@
                 <Border
                     Grid.Row="0"
                     BorderBrush="Gray"
-                    BorderThickness="1">
+                    BorderThickness="0,0,1,0">
                     <ToolBarPanel>
                         <ToolBar Background="White" ToolBarTray.IsLocked="True">
 

UniformMaterialManagementSystem/Views/SampleRegistration/SampleRegistrationManagePage.xaml

@@ -155,7 +155,7 @@
                 <Border
                     Grid.Row="0"
                     BorderBrush="Gray"
-                    BorderThickness="1">
+                    BorderThickness="0,0,1,0">
                     <ToolBarPanel>
                         <ToolBar Background="White" ToolBarTray.IsLocked="True">
 

UniformMaterialManagementSystem/Views/SampleRegistrationPage.xaml

@@ -9,7 +9,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
-    <Grid>
+    <Grid Background="White">
         <TabControl>
             <TabItem Header="抽样登记录入">
                 <sample:SampleRegistrationInputPage />