From d103cf000ed5c7a2dad040e6e893e08ac15af003 Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Tue, 30 May 2023 12:44:11 +0800
Subject: [PATCH] 1

---
 .../QualityTask/QualityViewModel.cs           | 10 +++++-----
 .../Views/QualityTask/QualityWindow.xaml      | 19 +++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
index 839d9098..f8418df1 100644
--- a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
+++ b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
@@ -440,11 +440,11 @@ namespace BBWY.Client.ViewModels
                     MessageBox.Show("无可用的合格证打印！");
                     return;
                 }
-                if (PurchaseSkuList.Where(p => p.IsSetCertificate).Count() > 0)
-                {
-                    MessageBox.Show("存在未确认的合格证,请先完成确认！");
-                    return;
-                }
+                //if (PurchaseSkuList.Where(p => p.IsSetCertificate).Count() > 0)
+                //{
+                //    MessageBox.Show("存在未确认的合格证,请先完成确认！");
+                //    return;
+                //}
                 if (PurchaseSkuList.Where(p => p.IsNeedCer && p.CerDTO.Id > 0).Count() <= 0)
                 {
                     MessageBox.Show("无可选的合格证打印！");
diff --git a/BBWY.Client/Views/QualityTask/QualityWindow.xaml b/BBWY.Client/Views/QualityTask/QualityWindow.xaml
index 030267de..1d4d4156 100644
--- a/BBWY.Client/Views/QualityTask/QualityWindow.xaml
+++ b/BBWY.Client/Views/QualityTask/QualityWindow.xaml
@@ -136,8 +136,8 @@
                                     <Run Text="份数:"/>
                                     <Run Text="{Binding WareHourseCount,Mode=TwoWay}"/>
                                 </TextBlock>
-                                <UniformGrid Columns="3" Margin="45 0 0 0" Height="30">
-                                    <TextBlock Text="预计完成时间: " VerticalAlignment="Center"/>
+                                <StackPanel Orientation="Horizontal" Margin="45 0 0 0" Height="30">
+                                    <TextBlock Text="预计完成时间: " VerticalAlignment="Center" Width="60"/>
                                     <Border BorderBrush="{StaticResource Border.Brush}"  Height="30" BorderThickness="1">
                                         <hc:ComboBox BorderThickness="0" ItemsSource="{Binding PreCompeteTimeDayList}" SelectedIndex="0"  Text="{Binding PreCompeteTimeDay}">
                                             
@@ -148,7 +148,7 @@
                                
                                         </hc:ComboBox>
                                     </Border>
-                                </UniformGrid>
+                                </StackPanel>
 
 
                             </StackPanel>
@@ -280,11 +280,10 @@
 
                                                     <StackPanel  Orientation="Horizontal"
                                                              Visibility="{Binding  IsNeedCer, Converter={StaticResource objConverter}, ConverterParameter=true:Collapsed:Visible }">
-                                                        <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"
-                                                               CommandParameter="{Binding PurchaseSkuId}" 
-                                                               Command="{Binding DataContext. LookCerCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"/>
+                                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" >
+                                                            <!--Visibility="{Binding  IsSetCertificate, Converter={StaticResource objConverter}, ConverterParameter=false:Visible:Collapsed }"-->
+                                                            <TextBlock Text="无需合格证"   Height="15"  Margin="5 0 0 0"
+                                                               />
                                                             <c:BButton Content="修改" Style="{StaticResource LinkButton}" Width="35"  Height="15" CommandParameter="{Binding }"  
                                                                Command="{Binding DataContext.SetCertificateCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                                                                />
@@ -355,8 +354,8 @@
                                                         <StackPanel  Orientation="Horizontal"
                                                              Visibility="{Binding  IsNeedCer, Converter={StaticResource objConverter}, ConverterParameter=true:Collapsed:Visible }">
                                                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" 
-                            Visibility="{Binding  IsSetCertificate, Converter={StaticResource objConverter}, ConverterParameter=false:Visible:Collapsed }">
-                                                                <TextBlock Text="无需合格证"   Height="15"  Margin="0 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}"