LT069288 há 3 meses atrás
pai
commit
5d18830f8a

BIN
UniformMaterialManagementSystem/Resources/Pictures/DeliveryReceipt.png


+ 2 - 0
UniformMaterialManagementSystem/UniformMaterialManagementSystem.csproj

@@ -14,6 +14,7 @@
 		<None Remove="Resources\Fonts\FluentSystemIcons-Filled.ttf" />
 		<None Remove="Resources\Fonts\FluentSystemIcons-Regular.ttf" />
 		<None Remove="Resources\Pictures\Contract.png" />
+		<None Remove="Resources\Pictures\DeliveryReceipt.png" />
 		<None Remove="Resources\Pictures\InspectApply.png" />
 		<None Remove="Resources\Pictures\InspectionRecord.png" />
 		<None Remove="Resources\Pictures\InspectionReport.png" />
@@ -34,6 +35,7 @@
 		<Resource Include="Resources\Pictures\Contract.png">
 		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Resource>
+		<Resource Include="Resources\Pictures\DeliveryReceipt.png" />
 		<Resource Include="Resources\Pictures\InspectApply.png">
 		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Resource>

+ 2 - 1
UniformMaterialManagementSystem/Views/InspectApplyPage.xaml

@@ -694,7 +694,8 @@
                                 AcceptsReturn="True"
                                 FontSize="14"
                                 Text="{Binding ApplyDescription, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                TextWrapping="Wrap" />
+                                TextWrapping="Wrap"
+                                VerticalScrollBarVisibility="Auto" />
 
                             <TextBlock
                                 Grid.Row="9"

+ 9 - 10
UniformMaterialManagementSystem/Views/InspectionRecordPage.xaml

@@ -860,19 +860,18 @@
                                         TextWrapping="Wrap">
                                         *申请检验准备情况说明:
                                     </TextBlock>
-                                    <ScrollViewer
+
+                                    <TextBox
+                                        x:Name="ApplyDescriptionTextBox"
                                         Grid.Row="8"
                                         Grid.Column="1"
                                         Grid.ColumnSpan="3"
-                                        VerticalScrollBarVisibility="Auto">
-                                        <TextBox
-                                            x:Name="ApplyDescriptionTextBox"
-                                            Padding="5"
-                                            FontSize="14"
-                                            IsEnabled="False"
-                                            Text="{Binding InspectApply.ApplyDescription, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                            TextWrapping="Wrap" />
-                                    </ScrollViewer>
+                                        Padding="5"
+                                        FontSize="14"
+                                        IsReadOnly="True"
+                                        Text="{Binding InspectApply.ApplyDescription, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                        TextWrapping="Wrap"
+                                        VerticalScrollBarVisibility="Auto" />
 
                                     <TextBlock
                                         Grid.Row="9"