diff --git a/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs index 06ae5ab0..6a4fee61 100644 --- a/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs @@ -484,8 +484,8 @@ namespace BBWY.Client.ViewModels.PackTask //SaveCerCommand = new RelayCommand(SaveCer); //BarLabelCheckCommand = new RelayCommand(BarLabelCheck); - CerLabelCheckCommand = new RelayCommand(CerLabelCheck); - SpuCerLabelCheckCommand = new RelayCommand(SpuCerLabelCheck); + //CerLabelCheckCommand = new RelayCommand(CerLabelCheck); + //SpuCerLabelCheckCommand = new RelayCommand(SpuCerLabelCheck); LookBarCommand = new RelayCommand(LookBar); @@ -493,7 +493,7 @@ namespace BBWY.Client.ViewModels.PackTask delayTrigger = new DelayTrigger(500); delayTrigger.OnExecute = OnSearchIncreateKeyWordChanged; - BarLabelCheck(BarcodeLabelModel.精简模板);//默认精简模式 + //BarLabelCheck(BarcodeLabelModel.精简模板);//默认精简模式 } //private void InseartCer() @@ -634,16 +634,7 @@ namespace BBWY.Client.ViewModels.PackTask }); look.Show(); } - private void SpuCerLabelCheck(CertificateLabelModel cer) - { - SpuCertificateModel.LabelModel = cer; - SpuCertificateModel.IsLogo = cer == CertificateLabelModel.标准有3c ? 1 : 0; - } - private void CerLabelCheck(CertificateLabelModel cer) - { - CertificateModel.LabelModel = cer; - CertificateModel.IsLogo = cer == CertificateLabelModel.标准有3c ? 1 : 0; - } + /// /// /// diff --git a/BBWY.Client/Views/PackTask/PrintWindow.xaml b/BBWY.Client/Views/PackTask/PrintWindow.xaml index ca1e0a6a..b7d3bd35 100644 --- a/BBWY.Client/Views/PackTask/PrintWindow.xaml +++ b/BBWY.Client/Views/PackTask/PrintWindow.xaml @@ -170,7 +170,7 @@ - +