Browse Source

代码逻辑优化

LT069288 2 months ago
parent
commit
78517578d4

+ 2 - 1
UniformMaterialManagementSystem/ViewModels/FactoryLicenseInputPageViewModel.cs

@@ -260,7 +260,8 @@ namespace UniformMaterialManagementSystem.ViewModels
             //发证单位
             Department = "军需能源质量监督总站" + App.CurrentUser!.SupervisionUnit.Name;
             EditUser = App.CurrentUser.UserName;
-
+            ApproveUser = string.Empty;
+            AuditUser = string.Empty;
         }
 
         public static ValidationResult? ValidateAuditUser(string auditUser, ValidationContext context)

+ 1 - 0
UniformMaterialManagementSystem/ViewModels/InspectionReportInputPageViewModel.cs

@@ -352,6 +352,7 @@ namespace UniformMaterialManagementSystem.ViewModels
                 ReportDesc = ReportDescTwo;
                 ConclusionDesc = ConclusionDescThree;
             }
+            InspectionReportDetails.Clear();
         }
 
         private string GetReportDesc(SampleRegistration? sample)

+ 5 - 0
UniformMaterialManagementSystem/ViewModels/SampleRegistrationInputPageViewModel.cs

@@ -177,9 +177,14 @@ namespace UniformMaterialManagementSystem.ViewModels
             EditTime = inspectApply.InspDate; //默认报检时间
             ProductDate = inspectApply.StartProductDate; //默认开始生产日期
             BatchNo = inspectApply.BatchNo;
+            PacketNo = string.Empty;
+            Quantity = 0;
             TestingItem = "全检";
+            RandomTip = string.Empty;
+            InspectionOrganization = string.Empty;
             ProductUsers = "我已知悉样品用途和后续处置方式,对以上样品的抽取封样程序、处理方式及样品的真实性和代表性均无异议。";
             EditUser = App.CurrentUser.UserName;
+            Telephone = string.Empty;
         }
 
         /// <summary>

+ 1 - 1
UniformMaterialManagementSystem/Views/SampleRegistration/SampleRegistrationInputPage.xaml

@@ -196,7 +196,7 @@
                                                     HorizontalAlignment="Center"
                                                     FontFamily="{StaticResource FluentSystemIconsRegular}"
                                                     FontSize="20"
-                                                    Text="{x:Static utils:RegularFontUtil.Save_32}" />
+                                                    Text="{x:Static utils:RegularFontUtil.Save_Arrow_Right_20}" />
                                                 <TextBlock Text="保存并导出登记表" />
                                             </StackPanel>
                                         </Border>