1

BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs

@@ -163,7 +163,7 @@ namespace BBWY.Client.ViewModels.PackTask
         private void DeletedTask(object obj)
         {
 
-            MessageBoxResult result = MessageBox.Show("确定删除?", "提示",
+            MessageBoxResult result = MessageBox.Show("确定取消任务?", "提示",
                                            MessageBoxButton.YesNo,
                                            MessageBoxImage.Warning);
             long taskId = (long)obj;

BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs

@@ -477,7 +477,6 @@ namespace BBWY.Client.ViewModels
             batchPrint.SetData(GoodProductQuantity,
                PurchaseSkuList.Where(p => p.IsNeedCer && p.CerDTO.Id > 0).Select(p => p.CerDTO).ToArray()
                 , BarCodeModel);
-
             batchPrint.ShowDialog();
 
 

BBWY.Client/Views/QualityTask/BatchPrintWindow.xaml

@@ -56,11 +56,11 @@
             </StackPanel>
             <StackPanel Orientation="Horizontal" Margin="50 10 0 0">
                 <TextBlock Text="条形码数量:" VerticalAlignment="Center" Margin="0 0 5 0" />
-                <c:BTextBox Name="barNumber" Width="100" WaterRemark="条形码数量"/>
+                <c:BTextBox Name="barNumber" Width="100" WaterRemark="填0不打印条形码"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal" Margin="50 10 0 0">
                 <TextBlock Text="合格证数量:" VerticalAlignment="Center" Margin="0 0 5 0" />
-                <c:BTextBox Name="cerNumber" Width="100" WaterRemark="合格证数量"/>
+                <c:BTextBox Name="cerNumber" Width="100" WaterRemark="填0不打印合格证"/>
             </StackPanel>
             
         </StackPanel>