1

BBWYB.Client/Views/MainWindow.xaml

@@ -24,7 +24,7 @@
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0">
                 <TextBlock Text="{Binding GlobalContext.User.Name}"/>
                 <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}"  Margin="5,0,0,0"/>
-                <TextBlock Text="v10015" Margin="5,0,0,0"/>
+                <TextBlock Text="v10016" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">

BBWYB.Client/Views/PackPurchaseTask/LookCerWindow.xaml

@@ -8,7 +8,7 @@
         mc:Ignorable="d"
         xmlns:hc="https://handyorg.github.io/handycontrol"
         Style="{StaticResource bwstyle}"
-        Height="373" Width="386"          
+        Height="340" Width="382"          
         xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
         xmlns:ctr="clr-namespace:BBWYB.Client.Converters"
         xmlns:cmodel="clr-namespace:BBWYB.Client.Models"

BBWYB.Client/Views/PackPurchaseTask/SetCerWindow.xaml.cs

@@ -80,6 +80,12 @@ namespace BBWYB.Client.Views.PackPurchaseTask
         private void save_btn_Click(object sender, RoutedEventArgs e)
         {
 
+            if (PackCerState== PackCerState.无需合格证)
+            {
+                if (SaveResult != null) SaveResult(CertificateModel, PackCerState);
+                this.Close();
+                return;
+            }
 
             if (string.IsNullOrEmpty(CertificateModel.ExcuteStander)
                 || string.IsNullOrEmpty(CertificateModel.Shader) || string.IsNullOrEmpty(CertificateModel.BrandName)
@@ -87,8 +93,26 @@ namespace BBWYB.Client.Views.PackPurchaseTask
                 || string.IsNullOrEmpty(CertificateModel.ProductAdress))
             {
                 //new TipsWindow("参数出错!请重新填写!").Show();
+                MessageBox.Show("有未填写的参数");
+                return;
+            }
+            if ((CertificateModel.LabelModel == CertificateLabelModel.标准无3c || CertificateModel.LabelModel == CertificateLabelModel.标准有3c) && string.IsNullOrEmpty(CertificateModel.ProductNo))
+            {
+                MessageBox.Show("型号不能为空");
                 return;
             }
+            if (CertificateModel.LabelModel == CertificateLabelModel.标准有3c && string.IsNullOrEmpty(CertificateModel.FactoryNumber))
+            {
+                MessageBox.Show("工厂编号不能为空");
+                return;
+            }
+            if (CertificateModel.LabelModel == CertificateLabelModel.适用年龄 && string.IsNullOrEmpty(CertificateModel.ApplyAge))
+            {
+                MessageBox.Show("适用年龄不能为空");
+                return;
+            }
+
+
             var standers = CertificateModel.ExcuteStander.Split(',', StringSplitOptions.RemoveEmptyEntries);
 
             var resData = packTaskService.SaveCer(new CerRequest

BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml

@@ -127,7 +127,7 @@
                 </StackPanel>
                 <Grid Grid.Column="1">
                     <ListBox x:Name="listbox_order" HorizontalAlignment="Left"
-                     Height="155" Width="900"  Margin="0"  ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                     Height="150" Width="900"  Margin="0"  ScrollViewer.HorizontalScrollBarVisibility="Auto"
                      ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
                      ItemsSource="{Binding PurchaseSkuList,Mode=TwoWay}"   
                      BorderBrush="{StaticResource Border.Brush}"
@@ -145,7 +145,7 @@
                                 <Grid  
                               MinHeight="100">
                                     <StackPanel Orientation="Horizontal">
-                                        <c:BAsyncImage UrlSource="{Binding Logo}"  BorderBrush="{StaticResource Border.Brush}" BorderThickness="1"
+                                        <c:BAsyncImage UrlSource="{Binding Logo}"  
                                                            Height="150"  Width="150" Stretch="Fill"
                                                            VerticalAlignment="Top" Margin="25 0 0 0"
                                                            Cursor="Hand">
@@ -215,9 +215,12 @@
                         Visibility="{Binding  IsSetCertificate, Converter={StaticResource objConverter}, ConverterParameter=true:Visible:Collapsed }"/>-->
                                                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" 
                             Visibility="{Binding  IsSetCertificate, Converter={StaticResource objConverter}, ConverterParameter=false:Visible:Collapsed }">
-                                                        <c:BButton Content="无需设置" Style="{StaticResource LinkButton}"   Height="15"  Margin="5 0 0 0"
+                                                        <TextBlock Text="无需合格证"  Height="15"  Margin="5 0 0 0"
+                                                             />
+
+                                                        <!--<c:BButton Content="无需设置"  Style="{StaticResource LinkButton}"   Height="15"  Margin="5 0 0 0"
                                                                CommandParameter="{Binding PurchaseSkuId}" 
-                                                               Command="{Binding DataContext. LookCerCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"/>
+                                                               Command="{Binding DataContext. LookCerCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"/>-->
                                                         <c:BButton Content="修改" Style="{StaticResource LinkButton}" Width="35"  Height="15" CommandParameter="{Binding }"  
                                                                Command="{Binding DataContext.SetCertificateCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                                                                />