From 3538ea78be9a56cd98159479b4b6ff512897624f Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Wed, 24 May 2023 15:56:30 +0800
Subject: [PATCH] 1
---
BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs | 2 +-
BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs | 1 -
BBWY.Client/Views/QualityTask/BatchPrintWindow.xaml | 4 ++--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
index 8680ba77..6218e4b8 100644
--- a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
+++ b/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;
diff --git a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
index dc28d734..93677f53 100644
--- a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
+++ b/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();
diff --git a/BBWY.Client/Views/QualityTask/BatchPrintWindow.xaml b/BBWY.Client/Views/QualityTask/BatchPrintWindow.xaml
index eb412902..68e6c71f 100644
--- a/BBWY.Client/Views/QualityTask/BatchPrintWindow.xaml
+++ b/BBWY.Client/Views/QualityTask/BatchPrintWindow.xaml
@@ -56,11 +56,11 @@
-
+
-
+