1

BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs

@@ -484,8 +484,8 @@ namespace BBWY.Client.ViewModels.PackTask
 
             //SaveCerCommand = new RelayCommand(SaveCer);
             //BarLabelCheckCommand = new RelayCommand<BarcodeLabelModel>(BarLabelCheck);
-            CerLabelCheckCommand = new RelayCommand<CertificateLabelModel>(CerLabelCheck);
+            //CerLabelCheckCommand = new RelayCommand<CertificateLabelModel>(CerLabelCheck);
-            SpuCerLabelCheckCommand = new RelayCommand<CertificateLabelModel>(SpuCerLabelCheck);
+            //SpuCerLabelCheckCommand = new RelayCommand<CertificateLabelModel>(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;
-        }
         /// <summary>
         /// 
         /// </summary>

BBWY.Client/Views/PackTask/PrintWindow.xaml

@@ -170,7 +170,7 @@
 
                     </Grid>
                 </Border>
-                <Border Name="is3c" Visibility="{Binding  LabelModel,Converter={StaticResource objConverter}, ConverterParameter=标准有3c:Visible:Collapsed}" BorderBrush="Black" BorderThickness="1"  VerticalAlignment="Top" HorizontalAlignment="Left">
+                <Border Name="is3c" Visibility="{Binding  LabelModel,Converter={StaticResource objConverter}, ConverterParameter= 标准有3c:Visible:Collapsed}" BorderBrush="Black" BorderThickness="1"  VerticalAlignment="Top" HorizontalAlignment="Left">
                     <Grid >
                         <TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12" />
                         <TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,90" />